Almost done fixing ACL. Added tests.