moved test classes to be in same packages as classes they are testing