More entitlement test refactoring