SES-1726 : Cleanup test imports