Bug 815093 - Test fix