Re #1709 Fix failing unit test