Fixed tests against recent renamings.
Added UserPermissionVoter to check for users as permission holders