Final fix of unit test