fixing up the tests so classes are in a file of their own