Whitespace
Change some integration tests to tidy-up after themselves
Merge pull request #117 from aodn/fix_integration_tests

Fix integration tests