Fixing failing spec test and audit-mode flag
Merge branch 'audit-mode' into tball/audit-tests
Merge branch 'audit-mode' into tball/audit-tests