diff --git a/functions/New-PSTGFunctionParameterTest.ps1 b/functions/New-PSTGFunctionParameterTest.ps1
index c160e31..f2dcd76 100644
--- a/functions/New-PSTGFunctionParameterTest.ps1
+++ b/functions/New-PSTGFunctionParameterTest.ps1
@@ -234,6 +234,7 @@ function New-PSTGFunctionParameterTest {
                     # Replace the markers with the content
                     $script = $script.Replace("___TESTCLASS___", $TestClass)
                     $script = $script.Replace("___TESTNAME___", $testName)
+                    $script = $script.Replace("___DATABASE___", $Database)
                     $script = $script.Replace("___SCHEMA___", $functionObject.Schema)
                     $script = $script.Replace("___NAME___", $functionObject.Name)
                     $script = $script.Replace("___CREATOR___", $creator)
diff --git a/functions/New-PSTGIndexColumnTest.ps1 b/functions/New-PSTGIndexColumnTest.ps1
index fda9c7b..d474de7 100644
--- a/functions/New-PSTGIndexColumnTest.ps1
+++ b/functions/New-PSTGIndexColumnTest.ps1
@@ -245,6 +245,7 @@ function New-PSTGIndexColumnTest {
                 # Replace the markers with the content
                 $script = $script.Replace("___TESTCLASS___", $TestClass)
                 $script = $script.Replace("___TESTNAME___", $testName)
+                $script = $script.Replace("___DATABASE___", $Database)
                 $script = $script.Replace("___NAME___", $indexObject.Name)
                 $script = $script.Replace("___CREATOR___", $creator)
                 $script = $script.Replace("___DATE___", $date)
diff --git a/functions/New-PSTGObjectExistenceTest.ps1 b/functions/New-PSTGObjectExistenceTest.ps1
index 2470887..15ffb29 100644
--- a/functions/New-PSTGObjectExistenceTest.ps1
+++ b/functions/New-PSTGObjectExistenceTest.ps1
@@ -272,6 +272,7 @@ function New-PSTGObjectExistenceTest {
                 # Replace the markers with the content
                 $script = $script.Replace("___TESTCLASS___", $TestClass)
                 $script = $script.Replace("___TESTNAME___", $testName)
+                $script = $script.Replace("___DATABASE___", $Database)
                 $script = $script.Replace("___OBJECTTYPE___", $($obj.ObjectType).ToLower())
                 $script = $script.Replace("___SCHEMA___", $obj.Schema)
                 $script = $script.Replace("___NAME___", $obj.Name)
diff --git a/functions/New-PSTGProcedureParameterTest.ps1 b/functions/New-PSTGProcedureParameterTest.ps1
index 87be6a4..d1a7d2b 100644
--- a/functions/New-PSTGProcedureParameterTest.ps1
+++ b/functions/New-PSTGProcedureParameterTest.ps1
@@ -235,6 +235,7 @@ function New-PSTGProcedureParameterTest {
                     # Replace the markers with the content
                     $script = $script.Replace("___TESTCLASS___", $TestClass)
                     $script = $script.Replace("___TESTNAME___", $testName)
+                    $script = $script.Replace("___DATABASE___", $Database)
                     $script = $script.Replace("___SCHEMA___", $procedureObject.Schema)
                     $script = $script.Replace("___NAME___", $procedureObject.Name)
                     $script = $script.Replace("___CREATOR___", $creator)
diff --git a/functions/New-PSTGTableColumnTest.ps1 b/functions/New-PSTGTableColumnTest.ps1
index 9a14e7e..d74a494 100644
--- a/functions/New-PSTGTableColumnTest.ps1
+++ b/functions/New-PSTGTableColumnTest.ps1
@@ -232,6 +232,7 @@ function New-PSTGTableColumnTest {
                 # Replace the markers with the content
                 $script = $script.Replace("___TESTCLASS___", $TestClass)
                 $script = $script.Replace("___TESTNAME___", $testName)
+                $script = $script.Replace("___DATABASE___", $Database)
                 $script = $script.Replace("___SCHEMA___", $tableObject.Schema)
                 $script = $script.Replace("___NAME___", $tableObject.Name)
                 $script = $script.Replace("___CREATOR___", $creator)
diff --git a/functions/New-PSTGTableConstraintTest.ps1 b/functions/New-PSTGTableConstraintTest.ps1
index 13d518c..e869b9e 100644
--- a/functions/New-PSTGTableConstraintTest.ps1
+++ b/functions/New-PSTGTableConstraintTest.ps1
@@ -228,6 +228,7 @@ function New-PSTGTableConstraintTest {
                 # Replace the markers with the content
                 $script = $script.Replace("___TESTCLASS___", $TestClass)
                 $script = $script.Replace("___TESTNAME___", $testName)
+                $script = $script.Replace("___DATABASE___", $Database)
                 $script = $script.Replace("___SCHEMA___", $object.Schema)
                 $script = $script.Replace("___NAME___", $object.Name)
                 $script = $script.Replace("___CREATOR___", $creator)
diff --git a/functions/New-PSTGTableIndexTest.ps1 b/functions/New-PSTGTableIndexTest.ps1
index db11283..eded26e 100644
--- a/functions/New-PSTGTableIndexTest.ps1
+++ b/functions/New-PSTGTableIndexTest.ps1
@@ -226,6 +226,7 @@ function New-PSTGTableIndexTest {
                     # Replace the markers with the content
                     $script = $script.Replace("___TESTCLASS___", $TestClass)
                     $script = $script.Replace("___TESTNAME___", $testName)
+                    $script = $script.Replace("___DATABASE___", $Database)
                     $script = $script.Replace("___SCHEMA___", $tableObject.Schema)
                     $script = $script.Replace("___NAME___", $tableObject.Name)
                     $script = $script.Replace("___CREATOR___", $creator)
diff --git a/functions/New-PSTGViewColumnTest.ps1 b/functions/New-PSTGViewColumnTest.ps1
index 5f908e2..2f590a1 100644
--- a/functions/New-PSTGViewColumnTest.ps1
+++ b/functions/New-PSTGViewColumnTest.ps1
@@ -234,6 +234,7 @@ function New-PSTGViewColumnTest {
                 # Replace the markers with the content
                 $script = $script.Replace("___TESTCLASS___", $TestClass)
                 $script = $script.Replace("___TESTNAME___", $testName)
+                $script = $script.Replace("___DATABASE___", $Database)
                 $script = $script.Replace("___SCHEMA___", $viewObject.Schema)
                 $script = $script.Replace("___NAME___", $viewObject.Name)
                 $script = $script.Replace("___CREATOR___", $creator)