Change genotype toString output and update tests