fixes #773
review changes + codestylesettings.xml indentation
review changes to test
Review change. Shortening syntax to the limit
Merge pull request #784 from aodn/issue-773

fixes #773