Use bb as a property
Remove the rest of the unnecessary test data sets

Also cleanup the test code.