Updated BVT tests