package refactoring tests