Fix test logic.
Merge topic 'MSVC-features' into next

769b3189 Fix test logic.