Further ACL work and tests