Merge "Clean up Unit tests for audit"