Fix some problem with unit tests pass