Fix opaque key TODOs left over from split-migrator changes and fixed test_image_import to use the correct course