Updates to parser and tests
Back out thrift dependency for now