incorporating changes from branch bpfortesting