Update tests for thirst removal
Merge pull request #452 from dlowe-net/update-tests-for-thirst-removal

Update tests for thirst removal