Test expectation updates from bug 225728