Fixing TxtParse bugs and making tests better