Updated water-test: added moon