Bug 1039239 - fixed tests