Fixed migration test failures after 06354a68ac