DEP-186 #comment Atesting for audit service + minor fix