Index: System tests/AutomatedSystemTests/AutomatedSystemTests/Script22.rxtst
===================================================================
diff -u -r58ae468e9346b6e926fcfd823ab03919ddcca34b -r773d89c1d7a45e7d9a2e384c4d3c35ac5fcd007b
--- System tests/AutomatedSystemTests/AutomatedSystemTests/Script22.rxtst	(.../Script22.rxtst)	(revision 58ae468e9346b6e926fcfd823ab03919ddcca34b)
+++ System tests/AutomatedSystemTests/AutomatedSystemTests/Script22.rxtst	(.../Script22.rxtst)	(revision 773d89c1d7a45e7d9a2e384c4d3c35ac5fcd007b)
@@ -841,6 +841,16 @@
 				</databinding>
 			</testmodule>
 			<smartfoldernode
+			id="9882e068-be69-493b-8d9b-3ad912df060c"
+			name="SaveProject">
+				<parameters>
+					<param
+					name="fileNameToSave"
+					value="script22.risk">
+					</param>
+				</parameters>
+			</smartfoldernode>
+			<smartfoldernode
 			datasource="script22_d_ValidationAfterManualAssessment"
 			id="99662edd-33d5-47ba-b495-ace7af131f41"
 			name="ValidateValuesInTable">
@@ -1300,6 +1310,40 @@
 			name="OpenSectionsCombinedView">
 			</smartfoldernode>
 			<testmodule
+			id="f7a2c461-12ca-484c-a96f-9479960f6386"
+			name="SaveAs"
+			ref="9195acd9-b037-4ace-80c3-0f7f64c35452"
+			type="Recording">
+				<databinding>
+					<var
+					dataname="fileNameToSave"
+					datasourceid="9882e068-be69-493b-8d9b-3ad912df060c"
+					variableid="d40271fe-a08b-44b0-bb48-a991f40e104b"
+					variablename="fileName">
+					</var>
+					<var
+					dataname="scriptOutputFolder"
+					datasourceid="78337b07-06ac-4efb-b70c-3605a183e682"
+					variableid="75a65d50-6a8f-4582-9f63-7c20d0f1ae9f"
+					variablename="scriptOutputPath">
+					</var>
+				</databinding>
+				<missingdatabinding>
+					<var
+					dataname="filename"
+					datasourceid="eb2fbef4-7d9e-4df6-b9be-4a6732b02d86"
+					variableid="d40271fe-a08b-44b0-bb48-a991f40e104b"
+					variablename="fileNameToSave">
+					</var>
+					<var
+					dataname="scriptOutputFolder"
+					datasourceid="08adf017-662c-43fb-a395-1601a27769e5"
+					variableid="75a65d50-6a8f-4582-9f63-7c20d0f1ae9f"
+					variablename="scriptOutputPath">
+					</var>
+				</missingdatabinding>
+			</testmodule>
+			<testmodule
 			id="f8c57e86-3ccc-402c-a567-d184de47414f"
 			name="CloseViewCentralPanelWithFocus"
 			ref="3c2d44f5-31b5-4584-91c8-1ad748affc77"
@@ -1854,6 +1898,14 @@
 								</smartfoldernode>
 							</smartfoldernode>
 						</smartfoldernode>
+						<smartfoldernode
+						id="9882e068-be69-493b-8d9b-3ad912df060c"
+						name="SaveProject">
+							<testmodule
+							id="f7a2c461-12ca-484c-a96f-9479960f6386"
+							name="SaveAs">
+							</testmodule>
+						</smartfoldernode>
 						<teardown
 						id="4584882f-0c24-4d1d-b35a-71e6c594cdf6"
 						name="teardown">
@@ -2277,6 +2329,9 @@
 			id="9669a194-aad9-4149-8d16-f92fc720643f">
 			</testcontainer>
 			<testcontainer
+			id="9882e068-be69-493b-8d9b-3ad912df060c">
+			</testcontainer>
+			<testcontainer
 			id="99662edd-33d5-47ba-b495-ace7af131f41">
 			</testcontainer>
 			<testcontainer