Fixing tests, and refacotring vcf parsing