Test fixes and default ACL, not all tests passing