Fixed test imports after refactor