Reorganize test.

- Add phone number to a piece of fixture data.  I'm going to assume that this is something that someone would pass anyhow, but that seems hasty too.
- Use location instead of options to obtain the company name, phone number, and attention name.