reorganized the tests a bit