fixed webapp integration tests, and refactored so easier to run just some, and to extend
fix integration tests which break because of locations needing to be managed
Merge pull request #819 from ahgittin/fix/integration-tests

fixes to webapp integration tests