Refactor PhoneNumber and accompanying tests

Complies with #33