Update imports in tests