Bug 1110234: Adjusting tests accordingly.