Acl test fixes

Make sure test passes in test environment, plus some other minor fixes.