addressing test thrift structs after merging master