refactoring tests; added new package class