Test coverage 100%
Merge branch 'shipments' of github.com:unepwcmc/SAPI into shipments