[BEP-1006] Refactor after vatMode BC fix, add test.