Merge "test: More VEYRON -> V23 renaming for enviroment variables."