revised tests
6 files changed