diff --git a/core/function.rs b/core/function.rs
index f54831ba4..d6cc28947 100644
--- a/core/function.rs
+++ b/core/function.rs
@@ -118,7 +118,7 @@ impl Func {
             "date" => Ok(Func::Scalar(ScalarFunc::Date)),
             "time" => Ok(Func::Scalar(ScalarFunc::Time)),
             "unicode" => Ok(Func::Scalar(ScalarFunc::Unicode)),
-            "json" => Ok(Func::Json((JsonFunc::JSON))),
+            "json" => Ok(Func::Json(JsonFunc::JSON)),
             _ => Err(()),
         }
     }
diff --git a/testing/scalar-functions.test b/testing/scalar-functions.test
index b29685118..41eed2fcc 100755
--- a/testing/scalar-functions.test
+++ b/testing/scalar-functions.test
@@ -239,24 +239,24 @@ do_execsql_test max-null {
   select max(null,null)
 } {}
 
-do_execsql_test substr-3-args {
-  SELECT substr('limbo', 1, 3);
+do_execsql_test substring-3-args {
+  SELECT substring('limbo', 1, 3);
 } {lim}
 
-do_execsql_test substr-3-args-exceed-length {
-  SELECT substr('limbo', 1, 10);
+do_execsql_test substring-3-args-exceed-length {
+  SELECT substring('limbo', 1, 10);
 } {limbo}
 
-do_execsql_test substr-3-args-start-exceed-length {
-  SELECT substr('limbo', 10, 3);
+do_execsql_test substring-3-args-start-exceed-length {
+  SELECT substring('limbo', 10, 3);
 } {}
 
-do_execsql_test substr-2-args {
-  SELECT substr('limbo', 3);
+do_execsql_test substring-2-args {
+  SELECT substring('limbo', 3);
 } {mbo}
 
-do_execsql_test substr-2-args-exceed-length {
-  SELECT substr('limbo', 10);
+do_execsql_test substring-2-args-exceed-length {
+  SELECT substring('limbo', 10);
 } {}
 
 do_execsql_test date-current-date {