Added NoSuchContainerException.
Updated some unit tests.