Fix more failing unit test ..