only check water attribute if it is not None
Merge branch 'master' of https://trac.orr.noaa.gov/git/PyGnome
fixed the tests that broke when testdata was refactored