Fixed B001+B002 with stubs
The stub
Fixed all tests, needs to stub database