Added underlying content type. Patched tests