make Audit model mockable in tests
Merge branch 'master' into ubuntu