Fixed a couple of tests and made a correction in thrift interface file