-batch.c:314: Test failed: unexpected char 0x43 position 0 in line 2 (got 'C:\test>echo Tests for cmd's builtin commands', wanted '@pwd@>echo Tests for cmd's builtin commands@space@')
-batch.c:314: Test failed: unexpected char 0x43 position 0 in line 5 (got 'C:\test>echo ------------ Testing 'echo' [ON] ------------', wanted '@pwd@>echo ------------ Testing 'echo' [ON] ------------@space@')
-batch.c:314: Test failed: unexpected char 0x43 position 0 in line 8 (got 'C:\test>echo word', wanted '@pwd@>echo word@space@')
-batch.c:314: Test failed: unexpected char 0x43 position 0 in line 11 (got 'C:\test>echo 'singlequotedword'', wanted '@pwd@>echo 'singlequotedword'@space@')
-batch.c:314: Test failed: unexpected char 0x43 position 0 in line 14 (got 'C:\test>echo "doublequotedword"', wanted '@pwd@>echo "doublequotedword"@space@')
-batch.c:314: Test failed: unexpected char 0x43 position 0 in line 18 (got 'C:\test>echo "/?"', wanted '@pwd@>echo "/?"@space@')
+batch.c:306: Test failed: excess characters on line 21 (got 'C:\test>echo. ', wanted '@pwd@>echo.')
-batch.c:314: Test failed: unexpected char 0x43 position 0 in line 24 (got 'C:\test>echo .', wanted '@pwd@>echo .@space@')
+batch.c:306: Test failed: excess characters on line 27 (got 'C:\test>echo.word ', wanted '@pwd@>echo.word')
-batch.c:314: Test failed: unexpected char 0x43 position 0 in line 30 (got 'C:\test>echo .word', wanted '@pwd@>echo .word@space@')
+batch.c:306: Test failed: excess characters on line 33 (got 'C:\test>echo: ', wanted '@pwd@>echo:')
-batch.c:314: Test failed: unexpected char 0x43 position 0 in line 36 (got 'C:\test>echo :', wanted '@pwd@>echo :@space@')
+batch.c:306: Test failed: excess characters on line 39 (got 'C:\test>echo:word ', wanted '@pwd@>echo:word')
-batch.c:314: Test failed: unexpected char 0x43 position 0 in line 42 (got 'C:\test>echo :word', wanted '@pwd@>echo :word@space@')
+batch.c:306: Test failed: excess characters on line 45 (got 'C:\test>echo/ ', wanted '@pwd@>echo/')
-batch.c:314: Test failed: unexpected char 0x43 position 0 in line 48 (got 'C:\test>echo /', wanted '@pwd@>echo /@space@')
+batch.c:306: Test failed: excess characters on line 51 (got 'C:\test>echo/word ', wanted '@pwd@>echo/word')
-batch.c:314: Test failed: unexpected char 0x43 position 0 in line 54 (got 'C:\test>echo /word', wanted '@pwd@>echo /word@space@')
-batch.c:314: Test failed: unexpected char 0x43 position 0 in line 57 (got 'C:\test>echo off now', wanted '@pwd@>echo off now@space@')
-batch.c:314: Test failed: unexpected char 0x43 position 0 in line 60 (got 'C:\test>echo word ', wanted '@pwd@>echo word@space@@space@')
-batch.c:314: Test failed: unexpected char 0x43 position 0 in line 63 (got 'C:\test>echo word  ', wanted '@pwd@>echo word@space@@space@@space@')
-batch.c:314: Test failed: unexpected char 0x43 position 0 in line 66 (got 'C:\test>echo word', wanted '@pwd@>echo word@space@')
-batch.c:314: Test failed: unexpected char 0x43 position 0 in line 69 (got 'C:\test>echo	word', wanted '@pwd@>echo@tab@word@space@')
-batch.c:314: Test failed: unexpected char 0x43 position 0 in line 72 (got 'C:\test>echo	word 	', wanted '@pwd@>echo@tab@word@space@@tab@@space@')
-batch.c:314: Test failed: unexpected char 0x43 position 0 in line 75 (got 'C:\test>echo	word	 ', wanted '@pwd@>echo@tab@word@tab@@space@@space@')
-batch.c:314: Test failed: unexpected char 0x43 position 0 in line 78 (got 'C:\test>echo word', wanted '@pwd@>echo word@space@')
-batch.c:314: Test failed: unexpected char 0x43 position 0 in line 81 (got 'C:\test>echo 	word', wanted '@pwd@>echo@space@@tab@word@space@')
-batch.c:314: Test failed: unexpected char 0x43 position 0 in line 84 (got 'C:\test>echo  	word', wanted '@pwd@>echo@space@@space@@tab@word@space@')
-batch.c:314: Test failed: unexpected char 0x43 position 0 in line 87 (got 'C:\test>echo		word', wanted '@pwd@>echo@tab@@tab@word@space@')
-batch.c:314: Test failed: unexpected char 0x43 position 0 in line 90 (got 'C:\test>echo 	 on  ', wanted '@pwd@>echo @tab@ on @space@@space@')
-batch.c:314: Test failed: unexpected char 0x43 position 0 in line 138 (got 'C:\test>if 1 == 1 echo foo', wanted '@pwd@>if 1 == 1 echo foo@space@')
+batch.c:306: Test failed: excess characters on line 141 (got 'C:\test>if 1 == 1  ', wanted '@pwd@>if 1 == 1@space@')
-batch.c:314: Test failed: unexpected char 0x43 position 0 in line 629 (got 'C:\test>type foobaz', wanted '@pwd@>type foobaz@space@')
-batch.c:314: Test failed: unexpected char 0x43 position 0 in line 632 (got 'C:\test>echo ---', wanted '@pwd@>echo ---@space@')