I have fixed the test failure in 020aa46bfb487332867c4da299efe6a75fe900c2, included in this pull request.