Moved test to test package
Corrected borken package names