Audit Fixes

Fixed two more audits
Code Coverage now at 51% total, 43% in src folder