Improve the containers unit tests (add error checking)
Merge remote-tracking branch 'origin/improve_container_tests'