Update content-types and be more flexible in expecting result.