Fixes some broken test
Adds contact_type enum to Person and Company models