Fix test failure with moved field