Fix problem with bfile stuff. 'make test' works again.