Fix Tests From Bug 876754 - 86d7da2 a=npotb