CompanyType validator
Fixing test
Merge pull request #1359 from cohitre/validateCompanyType

CompanyType validator