Fixing small issue so that the tests work again
Prevent event route tests from being poisoned by earlier failing tests
Merge remote-tracking branch 'origin/dev' into james_routes