BFV acceptance test fix; Closes #314