[#2468] Minor tweaks to new simulating auth in test env entry