FakeResponseHandler modified