Update imports for tests