Bug 956231 - Updated tests