[CLC-1765] More testing, other fixes