switch from mox to unittest.mock
Merge branch 'master' into deployment