Set more correct content type and add test for it.