Merge pull request #201 from jamiehannaford/test-helper-convenience

Adding test helper functions