inlined test handler for consistency with other tests
Merge pull request #114 from GavinJoyce/gj/test-consistency

making tests more consistent