Merge pull request #11659 from JMAConsulting/ut-fix
authorEileen McNaughton <eileen@mcnaughty.com>
Thu, 8 Feb 2018 19:59:58 +0000 (08:59 +1300)
committerGitHub <noreply@github.com>
Thu, 8 Feb 2018 19:59:58 +0000 (08:59 +1300)
Unit test fixes


Trivial merge