Bugzilla 443152 fixed some failed unit tests.