SOAP-1208 Optimized imports
SOAP-1208 Clean up in tests