Added container interface to tests