Adjust test imports for refactoring.