move test classes to separate packages
Move test classes to separate package, part 2