Changes and tests for #223
#223 Changes after review
Merge pull request #224 from aodn/issue223

Changes and tests for #223