Fix additional test failures caused by migration pollution