Might be good to have some tests for the migration cases?