Renamed tests to match class names, and changed multiple to rainfall
also added some alignment changes