Unit test fail fix2