Small test tidy ups
Merge pull request #192 from ianbarber/master

Small test tidy ups