Update custom response handler, tests