failUnless -> assertTrue
Merge pull request #1002 from JDWarner/asserttrue

Address PendingDeprecationWarnings in watershed tests