We now have a test for UPS.
Merge remote-tracking branch 'origin/jag/internal-nicknack' into jag/internal-nicknack