Fix-up failing unit test