Refactoring test packages