Cleaned use statements in test suite