diff --git a/ifrs17/Test/QueriesTest.ipynb b/ifrs17/Test/QueriesTest.ipynb
index d9b480fd..476e5d29 100644
--- a/ifrs17/Test/QueriesTest.ipynb
+++ b/ifrs17/Test/QueriesTest.ipynb
@@ -1121,10 +1121,233 @@
             "execution_count": 0,
             "outputs": []
         },
+        {
+            "cell_type": "markdown",
+            "source": [
+                "# Test Load Current Parameter"
+            ],
+            "metadata": {},
+            "execution_count": 0,
+            "outputs": []
+        },
+        {
+            "cell_type": "code",
+            "source": [
+                "public async Task<ActivityLog> CheckLoadCurrentParameterAsync<T>(Args args, IEnumerable<T> testData, ",
+                "\n                                                                (int Year, int Month, string Scenario) expectedCurrentPeriod, ",
+                "\n                                                                Func<T, string> identityExpression)",
+                "\nwhere T : IWithYearMonthAndScenario",
+                "\n{",
+                "\n    Activity.Start();",
+                "\n    await Workspace.UpdateAsync(testData);",
+                "\n    var firstParameter = (await Workspace.LoadCurrentParameterAsync<T>(args, identityExpression)).First();",
+                "\n    ",
+                "\n    //Check Current Period",
+                "\n    firstParameter.Value.Year.Should().Be(expectedCurrentPeriod.Year);",
+                "\n    firstParameter.Value.Month.Should().Be(expectedCurrentPeriod.Month);",
+                "\n    firstParameter.Value.Scenario.Should().Be(expectedCurrentPeriod.Scenario);",
+                "\n    ",
+                "\n    await Workspace.DeleteAsync(Workspace.Query<T>().ToArray());",
+                "\n    return Activity.Finish();",
+                "\n}"
+            ],
+            "metadata": {},
+            "execution_count": 0,
+            "outputs": []
+        },
+        {
+            "cell_type": "markdown",
+            "source": [
+                "## Partner Rating"
+            ],
+            "metadata": {},
+            "execution_count": 0,
+            "outputs": []
+        },
+        {
+            "cell_type": "code",
+            "source": [
+                "var args = new Args(\"CH\",2020,9,Periodicity.Monthly,scenario);",
+                "\nvar testData = new PartnerRating[] {new PartnerRating{ Partner = \"PT1\", Year = 2020, Month = 9, Scenario = scenario},",
+                "\n                                    new PartnerRating{ Partner = \"PT1\", Year = 2019, Month = 12, Scenario = null}};",
+                "\nvar activity = await CheckLoadCurrentParameterAsync<PartnerRating>(args, testData, (2020, 9, scenario), x => x.Partner);",
+                "\nactivity"
+            ],
+            "metadata": {},
+            "execution_count": 0,
+            "outputs": []
+        },
+        {
+            "cell_type": "code",
+            "source": [
+                "activity.Status.Should().Be(ActivityLogStatus.Succeeded);"
+            ],
+            "metadata": {},
+            "execution_count": 0,
+            "outputs": []
+        },
+        {
+            "cell_type": "code",
+            "source": [
+                "var args = new Args(\"CH\",2020,9,Periodicity.Monthly,null);",
+                "\nvar testData = new PartnerRating[] {new PartnerRating{ Partner = \"PT1\", Year = 2020, Month = 6, Scenario = null},",
+                "\n                                    new PartnerRating{ Partner = \"PT1\", Year = 2019, Month = 3, Scenario = null}};",
+                "\nvar activity = await CheckLoadCurrentParameterAsync<PartnerRating>(args, testData, (2020, 6, null), x => x.Partner);",
+                "\nactivity"
+            ],
+            "metadata": {},
+            "execution_count": 0,
+            "outputs": []
+        },
+        {
+            "cell_type": "code",
+            "source": [
+                "activity.Status.Should().Be(ActivityLogStatus.Succeeded);"
+            ],
+            "metadata": {},
+            "execution_count": 0,
+            "outputs": []
+        },
+        {
+            "cell_type": "code",
+            "source": [
+                "var args = new Args(\"CH\",2020,9,Periodicity.Monthly,scenario);",
+                "\nvar testData = new PartnerRating[] {new PartnerRating{ Partner = \"PT1\", Year = 2020, Month = 9, Scenario = scenario},",
+                "\n                                    new PartnerRating{ Partner = \"PT1\", Year = 2019, Month = 12, Scenario = scenario},",
+                "\n                                    new PartnerRating{ Partner = \"PT1\", Year = 2019, Month = 12, Scenario = null}};",
+                "\nvar activity = await CheckLoadCurrentParameterAsync<PartnerRating>(args, testData, (2020, 9, scenario), x => x.Partner);",
+                "\nactivity"
+            ],
+            "metadata": {},
+            "execution_count": 0,
+            "outputs": []
+        },
+        {
+            "cell_type": "code",
+            "source": [
+                "activity.Status.Should().Be(ActivityLogStatus.Succeeded);"
+            ],
+            "metadata": {},
+            "execution_count": 0,
+            "outputs": []
+        },
+        {
+            "cell_type": "code",
+            "source": [
+                "var args = new Args(\"CH\",2020,9,Periodicity.Monthly,scenario);",
+                "\nvar testData = new PartnerRating[] {new PartnerRating{ Partner = \"PT1\", Year = 2020, Month = 9, Scenario = null},",
+                "\n                                    new PartnerRating{ Partner = \"PT1\", Year = 2020, Month = 9, Scenario = scenario},",
+                "\n                                    new PartnerRating{ Partner = \"PT1\", Year = 2019, Month = 12, Scenario = null}};",
+                "\nvar activity = await CheckLoadCurrentParameterAsync<PartnerRating>(args, testData, (2020, 9, scenario), x => x.Partner);",
+                "\nactivity"
+            ],
+            "metadata": {},
+            "execution_count": 0,
+            "outputs": []
+        },
+        {
+            "cell_type": "code",
+            "source": [
+                "activity.Status.Should().Be(ActivityLogStatus.Succeeded);"
+            ],
+            "metadata": {},
+            "execution_count": 0,
+            "outputs": []
+        },
+        {
+            "cell_type": "markdown",
+            "source": [
+                "## Credit Default Rate"
+            ],
+            "metadata": {},
+            "execution_count": 0,
+            "outputs": []
+        },
+        {
+            "cell_type": "code",
+            "source": [
+                "var args = new Args(\"CH\",2020,9,Periodicity.Monthly,scenario);",
+                "\nvar testData = new CreditDefaultRate[] {new CreditDefaultRate{ CreditRiskRating = \"A\", Year = 2020, Month = 9, Scenario = scenario},",
+                "\n                                        new CreditDefaultRate{ CreditRiskRating = \"A\", Year = 2019, Month = 12, Scenario = null}};",
+                "\nvar activity = await CheckLoadCurrentParameterAsync<CreditDefaultRate>(args, testData, (2020, 9, scenario), x => x.CreditRiskRating);",
+                "\nactivity"
+            ],
+            "metadata": {},
+            "execution_count": 0,
+            "outputs": []
+        },
+        {
+            "cell_type": "code",
+            "source": [
+                "activity.Status.Should().Be(ActivityLogStatus.Succeeded);"
+            ],
+            "metadata": {},
+            "execution_count": 0,
+            "outputs": []
+        },
+        {
+            "cell_type": "code",
+            "source": [
+                "var args = new Args(\"CH\",2020,9,Periodicity.Monthly,scenario);",
+                "\nvar testData = new CreditDefaultRate[] {new CreditDefaultRate{ CreditRiskRating = \"A\", Year = 2020, Month = 9, Scenario = null},",
+                "\n                                        new CreditDefaultRate{ CreditRiskRating = \"A\", Year = 2019, Month = 12, Scenario = null}};",
+                "\nvar activity = await CheckLoadCurrentParameterAsync<CreditDefaultRate>(args, testData, (2020, 9, null), x => x.CreditRiskRating);",
+                "\nactivity"
+            ],
+            "metadata": {},
+            "execution_count": 0,
+            "outputs": []
+        },
+        {
+            "cell_type": "code",
+            "source": [
+                "activity.Status.Should().Be(ActivityLogStatus.Succeeded);"
+            ],
+            "metadata": {},
+            "execution_count": 0,
+            "outputs": []
+        },
+        {
+            "cell_type": "code",
+            "source": [
+                "var args = new Args(\"CH\",2020,9,Periodicity.Monthly,scenario);",
+                "\nvar testData = new CreditDefaultRate[] {new CreditDefaultRate{ CreditRiskRating = \"A\", Year = 2020, Month = 9, Scenario = scenario},",
+                "\n                                        new CreditDefaultRate{ CreditRiskRating = \"A\", Year = 2019, Month = 12, Scenario = scenario},",
+                "\n                                        new CreditDefaultRate{ CreditRiskRating = \"A\", Year = 2019, Month = 12, Scenario = null}};",
+                "\nvar activity = await CheckLoadCurrentParameterAsync<CreditDefaultRate>(args, testData, (2020, 9, scenario), x => x.CreditRiskRating);",
+                "\nactivity"
+            ],
+            "metadata": {},
+            "execution_count": 0,
+            "outputs": []
+        },
+        {
+            "cell_type": "code",
+            "source": [
+                "activity.Status.Should().Be(ActivityLogStatus.Succeeded);"
+            ],
+            "metadata": {},
+            "execution_count": 0,
+            "outputs": []
+        },
         {
             "cell_type": "code",
             "source": [
-                ""
+                "var args = new Args(\"CH\",2020,9,Periodicity.Monthly,scenario);",
+                "\nvar testData = new CreditDefaultRate[] {new CreditDefaultRate{ CreditRiskRating = \"PT1\", Year = 2020, Month = 9, Scenario = null},",
+                "\n                                        new CreditDefaultRate{ CreditRiskRating = \"PT1\", Year = 2020, Month = 9, Scenario = scenario},",
+                "\n                                        new CreditDefaultRate{ CreditRiskRating = \"PT1\", Year = 2019, Month = 12, Scenario = null}};",
+                "\nvar activity = await CheckLoadCurrentParameterAsync<CreditDefaultRate>(args, testData, (2020, 9, scenario), x => x.CreditRiskRating);",
+                "\nactivity"
+            ],
+            "metadata": {},
+            "execution_count": 0,
+            "outputs": []
+        },
+        {
+            "cell_type": "code",
+            "source": [
+                "activity.Status.Should().Be(ActivityLogStatus.Succeeded);"
             ],
             "metadata": {},
             "execution_count": 0,
diff --git a/ifrs17/Test/Tests.ipynb b/ifrs17/Test/Tests.ipynb
index 1692e5d0..26b2e61b 100644
--- a/ifrs17/Test/Tests.ipynb
+++ b/ifrs17/Test/Tests.ipynb
@@ -21,7 +21,7 @@
             "source": [
                 "<p style=\"font-weight:bold;\"> <span style=\"font-size: 36px\"> Tests </span> </p>",
                 "\n",
-                "\n<br> Execute this Notebook using at least 14Gb RAM."
+                "\n<br> Execute this Notebook using at least 16Gb RAM."
             ],
             "metadata": {},
             "execution_count": 0,