Clean-up VCF dumper output and elaborate on tests