Merge pull request #3165 from eileenmcnaughton/tests
authorEileen McNaughton <eileen@mcnaughty.com>
Mon, 5 May 2014 03:16:20 +0000 (20:16 -0700)
committerEileen McNaughton <eileen@mcnaughty.com>
Mon, 5 May 2014 03:16:20 +0000 (20:16 -0700)
test fixes & tidy up


Trivial merge