ACL Packager - Exclude Tokens from Principals; Tests and API cleanup