Added TDS and GH to Water Tests (Issue 22)