Renamed tests
Fixed import script