Bug 959694 - Follow-up. Unit test fixes.

Fixing unit tests.