Unit test Fix