Remove dependence on core classes for tests