improved requesthandler mocking