Fixing failing spec test and audit-mode flag