Fixed code and tests to get all tests passing after design update
Refactored auditing support
merge from pk