Merge "Move BH test to flaky and change it slightly" into pi-dev