Fixing bugs related to test migration