Add container unit testing