Fixed test imports