Add test for #2292, #2006
Merge branch 'feature/fix_content_type' into mischione
Fix content type in migrations.