Migration test fixes