Refactoring master importer. More to come.
Fixed broken unit tests