Fixed tests on windows; added option to preserve line numbers

Line numbers are preserved as long as #include is not used.