The following patch makes the tests pass.