Improve imports in tests