Package refactoring in tests