More testing. Added BDBJ.