Bug 866532: Fixing broken tests from the previous merge