Bug 919414 - Part 1: Clear existing calls in test setup. r=hsinyi
Bug 919414 - Part 2: Modify tests. r=hsinyi