Fix more testing errors