More test migration changes