further restructureing of tests
4 files changed