Make v6 tests compilable after sync to mainline