Fixed unit tests
p4#: 20659