Adding auditing, and adding to the tests.