1890: Fix more tests