Add test for #2292, #2006
Fix content type in migrations.
Rename migration
Remove print
Cleaner implementation of content type fix