Renamed module names in tests