Small improvements to VCF tests