Fixes to test numbering.
Add 'queryplantest' target to the MSVC makefile.