Update tests for thirst removal