Container Tests update