fix import paths so that tests pass