More tests for D2 migration