All but one questionable container test passing now