Bug 1034192, Bug 1034185 - fix app tests

Supersedes https://github.com/mozilla/kuma/pull/2791 with rebase to fix travis ci build.
done.