more tests

15 files changed