fix compile with clang++ after #2416
minor visual test updates after #2416