More unit test fail fixage