Fixed test and removed some unused imports