Merge pull request #6 from hollanddd/master

Cleaned up tests, looks good to me!
change verbiage of properties per USPS Publication 28