Fix tests
Merge branch 'master' of github.com:NERC-CEH/jules-jasmin