Merge "Refactor imports for text performance tests"