Gateway-3384 Unit test and more cleanup
Gateway-3384 Updated AD regression suite for correct auditing