Fix tests up to beatrix-- that needs more of new entitlement impl to work