Fix some failing tests for bug 918828. no_r=me, testonly, a=RyanVM on a CLOSED TREE.

--HG--
extra : rebase_source : 68ce3c64b1a2c8eaf1f26d7f4b4914753a49572f