Fixed algorithm for rec 60 parser.  Changed unittests to use a general function to test and just send different files to parse