fix tests according to bem/bh updates