Unit test fail fix0