VCL: Refactor VCL test (part 1)