Add container tests