Fix most of the UT failures