another round of speeding up BAT tests