Revert " - Amend the test cases."

This reverts commit 733f17c2a4a9ac954b89f625f5ec5d154610af8b.

Reverted for not containing the proper bug number. See bug 985853.
Bug 985853 - Amend the test cases. r=timdream