Fix container unit tests