Complete rewrite of the container tests
Forgot to add this in