Resolving merge conflicts
harmonized migrator format with existing unit tests.