WIP Update several unit test - commit to check if CI unit tests behave same


(cherry picked from commit c0c78eda)
2 jobs for cherry-pick-c0c78eda in 2 minutes and 54 seconds (queued for 1 minute and 51 seconds)