Bug 854840 - Follow-up bug 852924 to fix unit tests