Small cleanups for test_migrate