Fixed tests to use bb.data