Fix more bad tests