More test import fixing