Qbv2

fixes a few test failures in #318