- water test fixes