Bug 873498 - Fix tests due to bad rebasing r=schung