Merge "Use import for testAndCleanup"