Merge pull request #7884 from eileenmcnaughton/tests
authorEileen McNaughton <eileen@mcnaughty.com>
Mon, 29 Feb 2016 06:56:52 +0000 (19:56 +1300)
committerEileen McNaughton <eileen@mcnaughty.com>
Mon, 29 Feb 2016 06:56:52 +0000 (19:56 +1300)
further fixes to test hard-coding


Trivial merge