Fix more tests issues