ACL + Security tests + minor fixes