Small changes to bScan and bTest.