Fixed unit tests after the migration