Fixed unit tests.
Merge branch 'bug1011807' of https://github.com/yor-mozilla-com/gaia into bug1011807