[KFSQA-649] Added in remaining objects for this branch and temporarily set the scenario to @pending in preparation for partial master merge.