removed unused variable in test
Merge pull request #113 from GavinJoyce/gj/remove-unused-test-variable

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

making tests more consistent
made tests more consistent and removed unused code