Follow bindist changes in bindisttest