Refactor PhoneType and accompanying tests

Complies with #33
Refactor Privilege and accompanying tests

Complies with #33
Semantic cleanup of the local type tests

Complies with #33