Fix commented and broken tests after entitlement implementation