Changed lng to lon, added test for WheaterCollection + clean up