Tidy up
Move WebMock stubs into own module
Merge branch 'technical/refactoring'