Fix failing PromiseReturnValueHandlerTests