Merge pull request #331 from jrperritt/bfv-fix

BFV acceptance test fix; Closes #314