Changed name of test files
Remove some test crap
More testing and changed Genotype to include all genotype info