Fix more buggy tests