USPS improvements

Adds more complete fixtures and moves substitutions for service names to one Regex. Extracted from #184

@RichardBlair @garymardell