Add BCC neighbors and some related tests/analysis