fixed tests and also usps code that i hosed on friday