Revert "With bp test in the middle, we need less trials"

This reverts commit f50e2498910d82961ec8cc8fdd942e42a8d5004e.