[UnitTests] Fixed more unit tests.