Fix more failing tests...