Merge "tests: fix a few msvc warnings"