THRIFT-2132 broken tests