[#1251] Fix more tests