[0.3.9] Sanitize imports and remove use of deprecated trait "Suite" for tests.