adding integration tests for Water in the West collection
Merge branch 'master' into master_water