Fix more test failures for ACL IDs