Remove cross-test import