Tests, batch file fixes, stripping c++ headers