phone-number: made more idiomatic

also improve the test file.
@sjakobi Sorry, just had my first child born last week, so I'm taking longer than usual to get to things.