More cleanup and streamlining of acl functions and tests