B&B Added a couple more tests ...