Fix the remaining failing tests