Fix failing processor tests

Turned into a bit of a refactor to remove duplicate mock request code.