Fix more unit tests