Refactoring test package