added tests for wateruse files; created nosetests as well; figured out cleaner way to run tests so eliminate need for tests in module