get code up to date with latest bpan and test-more