Fixed broken test, added log mock
Merge branch 'master' into gmail