Updated water test; added sun rotation