Changing water poll test to order by id to see if this stops the tests randomly breaking.