Adjusted tests for the new phenotype code