* Fix two unit tests errors