Refactoring the tests slightly
Refactoring the tests slightly

tjcunliffe/hoverfly,tjcunliffe/hoverfly,tjcunliffe/hoverfly,SpectoLabs/hoverfly,tjcunliffe/hoverfly,tjcunliffe/hoverfly,SpectoLabs/hoverfly,tjcunliffe/hoverfly