trivial
Moved test classes to default package
Fix a bug in a test