fix migration, update todo for tests