Cleanup test imports