Unit test, refactor ACL
Unit test, refactor ACL