MSVC fix: extended test-interface"