FIx other unittests
Finish update unit tests