Fix more failing tests