refactoring: use same package in test as in production