Fixed error in test.txt
Fixed another error in test2.txt
Removed a mistaken change in test2.txt
Fixed error in test.txt
Fixed another error in test2.txt
Removed a mistaken change in test2.txt
Merge remote-tracking branch 'pydata/test2error' into test2error