Rework container test cases to track what's being put into fit services (restriction and link tracker). Also fix some code whicch choked on attempt to add None to containers