CLC-3369 Make test pass