moved test classes to the same package as the class under test