Removed some defaults from RenderEngine, updated water-test