Changed the package of some classes around
Test frame now works properly