TEZ-1772. Failing tests post TEZ-1737. (Jeff Zhang via hitesh)