fix unit tests issue