Updated UPS test to work with multiple containers