Merge "Remove unused imports from test classes"