Improved Container tests