Fix the remaining failing tests in Cadi