diff --git a/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/cross-dv16/cross-dv16.1.ddl.sqlpp b/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/cross-dv16/cross-dv16.1.ddl.sqlpp
index e3c10cc..5596974 100644
--- a/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/cross-dv16/cross-dv16.1.ddl.sqlpp
+++ b/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/cross-dv16/cross-dv16.1.ddl.sqlpp
@@ -39,4 +39,8 @@
 // UDF with two inputs
 create function testdv1.fun03(){
 testdv1.fun04()
-}
\ No newline at end of file
+}
+
+create function testdv1.fun04(){
+testdv1.fun02()
+}
diff --git a/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/query-issue455/query-issue455.1.ddl.sqlpp b/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/query-issue455/query-issue455.1.ddl.sqlpp
index 6cbb47f..1980f01 100644
--- a/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/query-issue455/query-issue455.1.ddl.sqlpp
+++ b/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/query-issue455/query-issue455.1.ddl.sqlpp
@@ -30,5 +30,5 @@
 
 create function printName()
 {
-"AsterixDB Shared nothing parallel BDMS"
+'AsterixDB Shared nothing parallel BDMS'
 }
diff --git a/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/query-issue489/query-issue489.1.ddl.sqlpp b/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/query-issue489/query-issue489.1.ddl.sqlpp
index 504f3ac..094401f 100644
--- a/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/query-issue489/query-issue489.1.ddl.sqlpp
+++ b/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/query-issue489/query-issue489.1.ddl.sqlpp
@@ -29,10 +29,10 @@
 
 create function f1()
 {
-"function with no input"
+'function with no input'
 }
 
 create function f1(a)
 {
-"function with input"
+'function with input'
 }
\ No newline at end of file
diff --git a/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml b/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml
index 4852f8f..58d9323 100644
--- a/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml
+++ b/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml
@@ -5447,13 +5447,12 @@
                 <output-dir compare="Text">cross-dv15</output-dir>
             </compilation-unit>
         </test-case>
-        <!--ASTERIXDB-1258
         <test-case FilePath="cross-dataverse">
             <compilation-unit name="cross-dv16">
                 <output-dir compare="Text">cross-dv16</output-dir>
                 <expected-error>SyntaxError: ERROR:Recursive invocation testdv1.fun04@0</expected-error>
             </compilation-unit>
-        </test-case>  -->
+        </test-case>
         <!--NotImplementedException: No binary comparator factory implemented for type RECORD.
         <test-case FilePath="cross-dataverse">
           <compilation-unit name="cross-dv17">
@@ -5510,13 +5509,12 @@
                 <output-dir compare="Text">query-issue172</output-dir>
             </compilation-unit>
         </test-case>
-        <!-- ASTERIXDB-1259 
         <test-case FilePath="user-defined-functions">
             <compilation-unit name="query-issue455">
                 <output-dir compare="Text">query-issue455</output-dir>
                 <expected-error>SyntaxError:  function test.printName@0 is undefined</expected-error>
             </compilation-unit>
-        </test-case>-->
+        </test-case>
         <test-case FilePath="user-defined-functions">
             <compilation-unit name="query-issue489">
                 <output-dir compare="Text">query-issue489</output-dir>