implemented usps detection and added several more test cases