test moved to the correct package
tests fixed
unused imports removed