repackage test classes
fix tests