fix tests for bb_organizations #359