Refactored BVT Test