diff --git a/ifrs17-template/Test/Tests.ipynb b/ifrs17-template/Test/Tests.ipynb
index 3a29c378..2a3d2bed 100644
--- a/ifrs17-template/Test/Tests.ipynb
+++ b/ifrs17-template/Test/Tests.ipynb
@@ -30,7 +30,7 @@
             "cell_type": "markdown",
             "source": [
                 "Comprehensive collection of tests executed on top of the Systemorph use cases (initialization).",
-                "\n<br> Execute this Notebook using at least 20Gb RAM."
+                "\n<br> Execute this Notebook using at least 12Gb RAM."
             ],
             "metadata": {},
             "execution_count": 0,
@@ -45,42 +45,6 @@
             "execution_count": 0,
             "outputs": []
         },
-        {
-            "cell_type": "code",
-            "source": [
-                "#!eval-notebook \"ImportStorageTest\""
-            ],
-            "metadata": {},
-            "execution_count": 0,
-            "outputs": []
-        },
-        {
-            "cell_type": "code",
-            "source": [
-                "#!eval-notebook \"ReportStorageTest\""
-            ],
-            "metadata": {},
-            "execution_count": 0,
-            "outputs": []
-        },
-        {
-            "cell_type": "code",
-            "source": [
-                "#!eval-notebook \"AocStructureTest\""
-            ],
-            "metadata": {},
-            "execution_count": 0,
-            "outputs": []
-        },
-        {
-            "cell_type": "code",
-            "source": [
-                "#!eval-notebook \"TechnicalMarginTest\""
-            ],
-            "metadata": {},
-            "execution_count": 0,
-            "outputs": []
-        },
         {
             "cell_type": "code",
             "source": [
@@ -163,4 +127,4 @@
             "outputs": []
         }
     ]
-}
+}
\ No newline at end of file
diff --git a/ifrs17-template/Test/AocStructureTest.ipynb b/ifrs17/Test/AocStructureTest.ipynb
similarity index 99%
rename from ifrs17-template/Test/AocStructureTest.ipynb
rename to ifrs17/Test/AocStructureTest.ipynb
index c13eee40..a230366e 100644
--- a/ifrs17-template/Test/AocStructureTest.ipynb
+++ b/ifrs17/Test/AocStructureTest.ipynb
@@ -29,7 +29,8 @@
         {
             "cell_type": "code",
             "source": [
-                "#!import \"TestData\""
+                "#!import \"../Import/Importers\"",
+                "\n#!import \"TestData\""
             ],
             "metadata": {},
             "execution_count": 0,
@@ -44,16 +45,6 @@
             "execution_count": 0,
             "outputs": []
         },
-        {
-            "cell_type": "code",
-            "source": [
-                "await DataSource.SetAsync();",
-                "\nDataSource.Reset(x => x.ResetCurrentPartitions());"
-            ],
-            "metadata": {},
-            "execution_count": 0,
-            "outputs": []
-        },
         {
             "cell_type": "code",
             "source": [
diff --git a/ifrs17-template/Test/ImportStorageTest.ipynb b/ifrs17/Test/ImportStorageTest.ipynb
similarity index 99%
rename from ifrs17-template/Test/ImportStorageTest.ipynb
rename to ifrs17/Test/ImportStorageTest.ipynb
index 985ef965..67a9871f 100644
--- a/ifrs17-template/Test/ImportStorageTest.ipynb
+++ b/ifrs17/Test/ImportStorageTest.ipynb
@@ -29,7 +29,8 @@
         {
             "cell_type": "code",
             "source": [
-                "#!import \"TestData\""
+                "#!import \"../Import/Importers\"",
+                "\n#!import \"TestData\""
             ],
             "metadata": {},
             "execution_count": 0,
@@ -44,16 +45,6 @@
             "execution_count": 0,
             "outputs": []
         },
-        {
-            "cell_type": "code",
-            "source": [
-                "await DataSource.SetAsync();",
-                "\nDataSource.Reset(x => x.ResetCurrentPartitions());"
-            ],
-            "metadata": {},
-            "execution_count": 0,
-            "outputs": []
-        },
         {
             "cell_type": "code",
             "source": [
diff --git a/ifrs17-template/Test/ReportStorageTest.ipynb b/ifrs17/Test/ReportStorageTest.ipynb
similarity index 94%
rename from ifrs17-template/Test/ReportStorageTest.ipynb
rename to ifrs17/Test/ReportStorageTest.ipynb
index 21d410fb..277fca1c 100644
--- a/ifrs17-template/Test/ReportStorageTest.ipynb
+++ b/ifrs17/Test/ReportStorageTest.ipynb
@@ -20,7 +20,8 @@
         {
             "cell_type": "code",
             "source": [
-                "#!import \"TestData\""
+                "#!import \"../Report/ReportStorage\"",
+                "\n#!import \"TestData\""
             ],
             "metadata": {},
             "execution_count": 0,
@@ -35,16 +36,6 @@
             "execution_count": 0,
             "outputs": []
         },
-        {
-            "cell_type": "code",
-            "source": [
-                "await DataSource.SetAsync();",
-                "\nDataSource.Reset(x => x.ResetCurrentPartitions());"
-            ],
-            "metadata": {},
-            "execution_count": 0,
-            "outputs": []
-        },
         {
             "cell_type": "code",
             "source": [
diff --git a/ifrs17-template/Test/TechnicalMarginTest.ipynb b/ifrs17/Test/TechnicalMarginTest.ipynb
similarity index 98%
rename from ifrs17-template/Test/TechnicalMarginTest.ipynb
rename to ifrs17/Test/TechnicalMarginTest.ipynb
index 537208b5..1e60b92a 100644
--- a/ifrs17-template/Test/TechnicalMarginTest.ipynb
+++ b/ifrs17/Test/TechnicalMarginTest.ipynb
@@ -29,7 +29,8 @@
         {
             "cell_type": "code",
             "source": [
-                "#!import \"TestData\""
+                "#!import \"../Import/Importers\"",
+                "\n#!import \"TestData\""
             ],
             "metadata": {},
             "execution_count": 0,
@@ -44,16 +45,6 @@
             "execution_count": 0,
             "outputs": []
         },
-        {
-            "cell_type": "code",
-            "source": [
-                "await DataSource.SetAsync();",
-                "\nDataSource.Reset(x => x.ResetCurrentPartitions());"
-            ],
-            "metadata": {},
-            "execution_count": 0,
-            "outputs": []
-        },
         {
             "cell_type": "code",
             "source": [
diff --git a/ifrs17-template/Test/TestData.ipynb b/ifrs17/Test/TestData.ipynb
similarity index 98%
rename from ifrs17-template/Test/TestData.ipynb
rename to ifrs17/Test/TestData.ipynb
index 66b22324..1326997d 100644
--- a/ifrs17-template/Test/TestData.ipynb
+++ b/ifrs17/Test/TestData.ipynb
@@ -15,16 +15,6 @@
     "nbformat": 4,
     "nbformat_minor": 5,
     "cells": [
-        {
-            "cell_type": "code",
-            "source": [
-                "#!import \"../Constants/CalculationEngine\"",
-                "\n#!eval calculationEngine"
-            ],
-            "metadata": {},
-            "execution_count": 0,
-            "outputs": []
-        },
         {
             "cell_type": "markdown",
             "source": [
diff --git a/ifrs17/Test/Tests.ipynb b/ifrs17/Test/Tests.ipynb
index 7a5e9882..a52dc9e6 100644
--- a/ifrs17/Test/Tests.ipynb
+++ b/ifrs17/Test/Tests.ipynb
@@ -59,6 +59,42 @@
             "metadata": {},
             "execution_count": 0,
             "outputs": []
+        },
+        {
+            "cell_type": "code",
+            "source": [
+                "#!eval-notebook \"AocStructureTest\""
+            ],
+            "metadata": {},
+            "execution_count": 0,
+            "outputs": []
+        },
+        {
+            "cell_type": "code",
+            "source": [
+                "#!eval-notebook \"ImportStorageTest\""
+            ],
+            "metadata": {},
+            "execution_count": 0,
+            "outputs": []
+        },
+        {
+            "cell_type": "code",
+            "source": [
+                "#!eval-notebook \"ReportStorageTest\""
+            ],
+            "metadata": {},
+            "execution_count": 0,
+            "outputs": []
+        },
+        {
+            "cell_type": "code",
+            "source": [
+                "#!eval-notebook \"TechnicalMarginTest\""
+            ],
+            "metadata": {},
+            "execution_count": 0,
+            "outputs": []
         }
     ]
 }
\ No newline at end of file