update tests, update some error messages, make sure x-entitlement is array