Fix and tests for #141
Merge branch 'master' of https://github.com/aodn/aodn-portal