Fix Unit test Issue.