Tested broker ACL & fixed bugs