Update: use WaterTestFromVolumesIndirect to simplify code This could be a small optimization, since we have to move less data around, but not focusing on that - just trying to reduce complexity. Tests: ran unit tests