Chanched Genotype parameters
Added tests for Individual and Family
Merge branch 'feature/change_variant' into develop