Fixed additional UT failures