test package refactoring