Regression from Grischa's ACL improvements

This fixes a regression resulting from Grisha's ACL improvements.

The second commit is an unrelated unit test fix / enhancement