Changed imports in tests/support