final fix for the unit test case...