diff --git a/src/test/rpc/RPCCall_test.cpp b/src/test/rpc/RPCCall_test.cpp
index 896c7ef100..f8b6cba3a9 100644
--- a/src/test/rpc/RPCCall_test.cpp
+++ b/src/test/rpc/RPCCall_test.cpp
@@ -24,10 +24,6 @@ struct RPCCallTestData
     // List of passed arguments.
     std::vector<char const*> const args;
 
-    // If it throws, what does it throw?
-    enum Exception { no_exception = 0, bad_cast };
-    Exception const throwsWhat;
-
     // Expected JSON response.
     std::vector<char const*> exp;
 
@@ -35,13 +31,8 @@ struct RPCCallTestData
         char const* description_,
         int line_,
         std::initializer_list<char const*> const& args_,
-        Exception throwsWhat_,
         char const* exp_)
-        : description(description_)
-        , line(line_)
-        , args(args_)
-        , throwsWhat(throwsWhat_)
-        , exp(1, exp_)
+        : description(description_), line(line_), args(args_), exp(1, exp_)
     {
     }
 
@@ -49,13 +40,8 @@ struct RPCCallTestData
         char const* description_,
         int line_,
         std::initializer_list<char const*> const& args_,
-        Exception throwsWhat_,
         std::initializer_list<char const*> exp_)
-        : description(description_)
-        , line(line_)
-        , args(args_)
-        , throwsWhat(throwsWhat_)
-        , exp(exp_)
+        : description(description_), line(line_), args(args_), exp(exp_)
     {
     }
 
@@ -74,7 +60,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"account_channels: minimal.",
      __LINE__,
      {"account_channels", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "account_channels",
     "params" : [
@@ -89,7 +74,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {"account_channels",
       "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh",
       "rD5MbavGfiSC5m7mkxy1FANuT7s3HxqpoF"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "account_channels",
     "params" : [
@@ -105,7 +89,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {"account_channels",
       "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh",
       "r9emE59aTWb85t64dAebKrxYMBTpzK5yR7"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "account_channels",
     "params" : [
@@ -121,7 +104,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {"account_channels",
       "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh",
       "rnUy2SHTrB9DubsPmkJZUXTf5FcNDGrYEA"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "account_channels",
     "params" : [
@@ -138,7 +120,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh",
       "rnUy2SHTrB9DubsPmkJZUXTf5FcNDGrYEA",
       "0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "account_channels",
     "params" : [
@@ -156,7 +137,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh",
       "rnUy2SHTrB9DubsPmkJZUXTf5FcNDGrYEA",
       "90210"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "account_channels",
     "params" : [
@@ -173,7 +153,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "account_channels",
      },
-     RPCCallTestData::no_exception,
      R"({
     "method" : "account_channels",
     "params" : [
@@ -191,7 +170,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "rnUy2SHTrB9DubsPmkJZUXTf5FcNDGrYEA",
       "current",
       "extra"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "account_channels",
     "params" : [
@@ -208,7 +186,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "account_channels",
          "",  // Note: very few values are detected as bad!
      },
-     RPCCallTestData::no_exception,
      R"({
     "method" : "account_channels",
     "params" : [
@@ -225,7 +202,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"account_currencies: minimal 1.",
      __LINE__,
      {"account_currencies", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "account_currencies",
     "params" : [
@@ -238,7 +214,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"account_currencies: minimal 2.",
      __LINE__,
      {"account_currencies", "racb4o3DrdYxuCfyVa6vsLb7vgju9RFbBr"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "account_currencies",
     "params" : [
@@ -251,7 +226,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"account_currencies: ledger index.",
      __LINE__,
      {"account_currencies", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh", "42"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "account_currencies",
     "params" : [
@@ -265,7 +239,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"account_currencies: validated ledger.",
      __LINE__,
      {"account_currencies", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh", "validated"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "account_currencies",
     "params" : [
@@ -279,7 +252,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"account_currencies: current ledger.",
      __LINE__,
      {"account_currencies", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh", "current"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "account_currencies",
     "params" : [
@@ -295,7 +267,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "account_currencies",
      },
-     RPCCallTestData::no_exception,
      R"({
     "method" : "account_currencies",
     "params" : [
@@ -313,7 +284,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "current",
       "spare1",
       "spare2"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "account_currencies",
     "params" : [
@@ -327,7 +297,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"account_currencies: invalid second argument.",
      __LINE__,
      {"account_currencies", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh", "yup"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "account_currencies",
     "params" : [
@@ -345,7 +314,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
             "account_currencies",
             "",  // Note: very few values are detected as bad!
         },
-        RPCCallTestData::no_exception,
         R"({
     "method" : "account_currencies",
     "params" : [
@@ -363,7 +331,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"account_info: minimal.",
      __LINE__,
      {"account_info", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "account_info",
     "params" : [
@@ -376,7 +343,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"account_info: with numeric ledger index.",
      __LINE__,
      {"account_info", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh", "77777"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "account_info",
     "params" : [
@@ -390,7 +356,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"account_info: with text ledger index.",
      __LINE__,
      {"account_info", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh", "closed"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "account_info",
     "params" : [
@@ -406,7 +371,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {"account_info",
       "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh",
       "0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "account_info",
     "params" : [
@@ -420,7 +384,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"account_info: with ledger index.",
      __LINE__,
      {"account_info", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh", "validated"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "account_info",
     "params" : [
@@ -436,7 +399,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "account_info",
      },
-     RPCCallTestData::no_exception,
      R"({
     "method" : "account_info",
     "params" : [
@@ -454,7 +416,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "current",
       "extra1",
       "extra2"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "account_info",
     "params" : [
@@ -472,7 +433,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
             "account_info",
             "",  // Note: very few values are detected as bad!
         },
-        RPCCallTestData::no_exception,
         R"({
     "method" : "account_info",
     "params" : [
@@ -490,7 +450,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"account_lines: minimal.",
      __LINE__,
      {"account_lines", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "account_lines",
     "params" : [
@@ -505,7 +464,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {"account_lines",
       "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh",
       "rnUy2SHTrB9DubsPmkJZUXTf5FcNDGrYEA"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "account_lines",
     "params" : [
@@ -522,7 +480,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh",
       "rnUy2SHTrB9DubsPmkJZUXTf5FcNDGrYEA",
       "888888888"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "account_lines",
     "params" : [
@@ -540,7 +497,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh",
       "rnUy2SHTrB9DubsPmkJZUXTf5FcNDGrYEA",
       "closed"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "account_lines",
     "params" : [
@@ -558,7 +514,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh",
       "rnUy2SHTrB9DubsPmkJZUXTf5FcNDGrYEA",
       "FFFFEEEEDDDDCCCCBBBBAAAA9999888877776666555544443333222211110000"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "account_lines",
     "params" : [
@@ -575,7 +530,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "account_lines",
      },
-     RPCCallTestData::no_exception,
      R"({
     "method" : "account_lines",
     "params" : [
@@ -594,7 +548,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "rnUy2SHTrB9DubsPmkJZUXTf5FcNDGrYEA",
       "12345678",
       "current"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "account_lines",
     "params" : [
@@ -615,7 +568,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "12345678",
       "current",
       "0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "account_lines",
     "params" : [
@@ -636,7 +588,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "current",
       "0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF",
       "validated"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "account_lines",
     "params" : [
@@ -654,7 +605,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
             "account_lines",
             "",  // Note: very few values are detected as bad!
         },
-        RPCCallTestData::no_exception,
         R"({
     "method" : "account_lines",
     "params" : [
@@ -674,7 +624,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
             "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh",
             ""  // Note: very few values are detected as bad!
         },
-        RPCCallTestData::no_exception,
         R"({
     "method" : "account_lines",
     "params" : [
@@ -692,7 +641,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh",
          "rnUy2SHTrB9DubsPmkJZUXTf5FcNDGrYEA",
          "not_a_ledger"},
-        RPCCallTestData::no_exception,
         R"({
     "method" : "account_lines",
     "params" : [
@@ -711,7 +659,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"account_objects: minimal.",
      __LINE__,
      {"account_objects", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "account_objects",
     "params" : [
@@ -724,7 +671,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"account_objects: with numeric ledger index.",
      __LINE__,
      {"account_objects", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh", "77777"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "account_objects",
     "params" : [
@@ -738,7 +684,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"account_objects: with text ledger index.",
      __LINE__,
      {"account_objects", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh", "closed"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "account_objects",
     "params" : [
@@ -754,7 +699,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {"account_objects",
       "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh",
       "0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "account_objects",
     "params" : [
@@ -768,7 +712,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"account_objects: with ledger index.",
      __LINE__,
      {"account_objects", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh", "validated"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "account_objects",
     "params" : [
@@ -784,7 +727,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "account_objects",
      },
-     RPCCallTestData::no_exception,
      R"({
     "method" : "account_objects",
     "params" : [
@@ -805,7 +747,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "extra1",
          "extra2",
      },
-     RPCCallTestData::no_exception,
      R"({
     "method" : "account_objects",
     "params" : [
@@ -826,7 +767,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "extra2",
          "extra3",
      },
-     RPCCallTestData::no_exception,
      R"({
     "method" : "account_objects",
     "params" : [
@@ -847,7 +787,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "extra3",
          "extra4",
      },
-     RPCCallTestData::no_exception,
      R"({
     "method" : "account_objects",
     "params" : [
@@ -865,7 +804,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
             "account_objects",
             "",  // Note: very few values are detected as bad!
         },
-        RPCCallTestData::no_exception,
         R"({
     "method" : "account_objects",
     "params" : [
@@ -883,7 +821,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
         "account_objects: invalid ledger selection 1.",
         __LINE__,
         {"account_objects", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh", "no_ledger"},
-        RPCCallTestData::no_exception,
         R"({
     "method" : "account_objects",
     "params" : [
@@ -901,7 +838,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
         "account_objects: invalid ledger selection 2.",
         __LINE__,
         {"account_objects", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh", "no_ledger"},
-        RPCCallTestData::no_exception,
         R"({
     "method" : "account_objects",
     "params" : [
@@ -919,7 +855,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"account_offers: minimal.",
      __LINE__,
      {"account_offers", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "account_offers",
     "params" : [
@@ -932,7 +867,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"account_offers: with numeric ledger index.",
      __LINE__,
      {"account_offers", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh", "987654321"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "account_offers",
     "params" : [
@@ -946,7 +880,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"account_offers: with text ledger index.",
      __LINE__,
      {"account_offers", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh", "validated"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "account_offers",
     "params" : [
@@ -962,7 +895,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {"account_offers",
       "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh",
       "0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "account_offers",
     "params" : [
@@ -976,7 +908,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"account_offers: with ledger index.",
      __LINE__,
      {"account_offers", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh", "validated"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "account_offers",
     "params" : [
@@ -992,7 +923,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "account_offers",
      },
-     RPCCallTestData::no_exception,
      R"({
     "method" : "account_offers",
     "params" : [
@@ -1010,7 +940,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh",
       "current",
       "extra"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "account_offers",
     "params" : [
@@ -1030,7 +959,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "extra2",
          "extra3",
      },
-     RPCCallTestData::no_exception,
      R"({
     "method" : "account_offers",
     "params" : [
@@ -1048,7 +976,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
             "account_offers",
             "",  // Note: very few values are detected as bad!
         },
-        RPCCallTestData::no_exception,
         R"({
     "method" : "account_offers",
     "params" : [
@@ -1066,7 +993,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
         "account_offers: invalid ledger selection 1.",
         __LINE__,
         {"account_offers", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh", "no_ledger"},
-        RPCCallTestData::no_exception,
         R"({
     "method" : "account_offers",
     "params" : [
@@ -1084,7 +1010,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
         "account_offers: invalid ledger selection 2.",
         __LINE__,
         {"account_offers", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh", "no_ledger"},
-        RPCCallTestData::no_exception,
         R"({
     "method" : "account_offers",
     "params" : [
@@ -1102,7 +1027,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"account_tx: minimal.",
      __LINE__,
      {"account_tx", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "account_tx",
     "params" : [
@@ -1115,7 +1039,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"account_tx: ledger_index .",
      __LINE__,
      {"account_tx", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh", "444"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "account_tx",
     "params" : [
@@ -1134,7 +1057,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "descending",
       "binary",
       "count"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "account_tx",
     "params" : [
@@ -1151,7 +1073,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"account_tx: ledger_index_min and _max.",
      __LINE__,
      {"account_tx", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh", "-1", "-1"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "account_tx",
     "params" : [
@@ -1172,7 +1093,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "binary",
       "count",
       "descending"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "account_tx",
     "params" : [
@@ -1190,7 +1110,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"account_tx: ledger_index_min and _max plus limit.",
      __LINE__,
      {"account_tx", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh", "247", "-1", "300"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "account_tx",
     "params" : [
@@ -1213,7 +1132,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "count",
       "descending",
       "binary"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "account_tx",
     "params" : [
@@ -1237,7 +1155,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "590",
       "67",
       "45"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "account_tx",
     "params" : [
@@ -1261,7 +1178,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "45",
       "descending",
       "count"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "account_tx",
     "params" : [
@@ -1282,7 +1198,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "account_tx",
      },
-     RPCCallTestData::no_exception,
      R"({
     "method" : "account_tx",
     "params" : [
@@ -1305,7 +1220,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "descending",
       "count",
       "binary"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "account_tx",
     "params" : [
@@ -1320,7 +1234,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
         "account_tx: invalid accountID.",
         __LINE__,
         {"account_tx", "rHb9CJAWyB4rj9!VRWn96DkukG4bwdtyTh"},
-        RPCCallTestData::no_exception,
         R"({
     "method" : "account_tx",
     "params" : [
@@ -1337,7 +1250,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
         "account_tx: invalid ledger.",
         __LINE__,
         {"account_tx", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh", "-478.7"},
-        RPCCallTestData::no_exception,
         R"({
     "method" : "account_tx",
     "params" : [
@@ -1353,7 +1265,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
         "account_tx: max less than min.",
         __LINE__,
         {"account_tx", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh", "580", "579"},
-        RPCCallTestData::no_exception,
         {
             R"({
     "method" : "account_tx",
@@ -1381,7 +1292,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
         "account_tx: non-integer min.",
         __LINE__,
         {"account_tx", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh", "Binary", "-1"},
-        RPCCallTestData::no_exception,
         R"({
    "method" : "account_tx",
    "params" : [
@@ -1397,7 +1307,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
         "account_tx: non-integer max.",
         __LINE__,
         {"account_tx", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh", "-1", "counts"},
-        RPCCallTestData::no_exception,
         R"({
    "method" : "account_tx",
    "params" : [
@@ -1418,7 +1327,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "-1",
          "200",
          "bad_offset"},
-        RPCCallTestData::no_exception,
         R"({
    "method" : "account_tx",
    "params" : [
@@ -1437,7 +1345,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "-1",
          "-1",
          "bad_limit"},
-        RPCCallTestData::no_exception,
         R"({
    "method" : "account_tx",
    "params" : [
@@ -1458,7 +1365,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "false",
       "false",
       "false"},
-     RPCCallTestData::no_exception,
      R"({
    "method" : "account_tx",
    "params" : [
@@ -1478,7 +1384,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "USD",
          "EUR",
      },
-     RPCCallTestData::no_exception,
      R"({
     "method" : "book_offers",
     "params" : [
@@ -1500,7 +1405,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "USD/rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh",
          "EUR/rnUy2SHTrB9DubsPmkJZUXTf5FcNDGrYEA",
      },
-     RPCCallTestData::no_exception,
      R"({
     "method" : "book_offers",
     "params" : [
@@ -1522,7 +1426,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
      "book_offers: add issuer.",
      __LINE__,
      {"book_offers", "USD", "EUR", "rnUy2SHTrB9DubsPmkJZUXTf5FcNDGrYEA"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "book_offers",
     "params" : [
@@ -1545,7 +1448,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "EUR",
       "rnUy2SHTrB9DubsPmkJZUXTf5FcNDGrYEA",
       "666"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "book_offers",
     "params" : [
@@ -1570,7 +1472,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "EUR/rnUy2SHTrB9DubsPmkJZUXTf5FcNDGrYEA",
       "rnUy2SHTrB9DubsPmkJZUXTf5FcNDGrYEA",
       "current"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "book_offers",
     "params" : [
@@ -1595,7 +1496,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "EUR/rnUy2SHTrB9DubsPmkJZUXTf5FcNDGrYEA",
       "rnUy2SHTrB9DubsPmkJZUXTf5FcNDGrYEA",
       "ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "book_offers",
     "params" : [
@@ -1624,7 +1524,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789",
          "200",
      },
-     RPCCallTestData::no_exception,
      R"({
     "method" : "book_offers",
     "params" : [
@@ -1655,7 +1554,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "200",
       "0",
       "MyMarker"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "book_offers",
     "params" : [
@@ -1682,7 +1580,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "book_offers",
      },
-     RPCCallTestData::no_exception,
      R"({
     "method" : "book_offers",
     "params" : [
@@ -1704,7 +1601,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "0",
       "MyMarker",
       "extra"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "book_offers",
     "params" : [
@@ -1723,7 +1619,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "/rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh",
          "EUR/rnUy2SHTrB9DubsPmkJZUXTf5FcNDGrYEA",
      },
-     RPCCallTestData::no_exception,
      R"({
     "method" : "book_offers",
     "params" : [
@@ -1741,7 +1636,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "USD/rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh",
          "/rnUy2SHTrB9DubsPmkJZUXTf5FcNDGrYEA",
      },
-     RPCCallTestData::no_exception,
      R"({
     "method" : "book_offers",
     "params" : [
@@ -1755,7 +1649,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"book_offers: invalid issuer.",
      __LINE__,
      {"book_offers", "USD", "EUR", "not_a_valid_issuer"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "book_offers",
     "params" : [
@@ -1778,7 +1671,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "EUR/rnUy2SHTrB9DubsPmkJZUXTf5FcNDGrYEA",
       "rnUy2SHTrB9DubsPmkJZUXTf5FcNDGrYEA",
       "not_a_ledger"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "book_offers",
     "params" : [
@@ -1807,7 +1699,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789",
          "not_a_number",
      },
-     RPCCallTestData::no_exception,
      R"({
     "method" : "book_offers",
     "params" : [
@@ -1826,7 +1717,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "can_delete",
      },
-     RPCCallTestData::no_exception,
      R"({
     "method" : "can_delete",
     "params" : [
@@ -1841,7 +1731,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "can_delete",
          "4294967295",
      },
-     RPCCallTestData::no_exception,
      R"({
     "method" : "can_delete",
     "params" : [
@@ -1857,7 +1746,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "can_delete",
          "FEDCBA9876543210FEDCBA9876543210FEDCBA9876543210FEDCBA9876543210",
      },
-     RPCCallTestData::no_exception,
      R"({
     "method" : "can_delete",
     "params" : [
@@ -1873,7 +1761,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "can_delete",
          "always",
      },
-     RPCCallTestData::no_exception,
      R"({
     "method" : "can_delete",
     "params" : [
@@ -1889,7 +1776,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "can_delete",
          "never",
      },
-     RPCCallTestData::no_exception,
      R"({
     "method" : "can_delete",
     "params" : [
@@ -1905,7 +1791,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "can_delete",
          "now",
      },
-     RPCCallTestData::no_exception,
      R"({
     "method" : "can_delete",
     "params" : [
@@ -1918,7 +1803,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"can_delete: too many arguments.",
      __LINE__,
      {"can_delete", "always", "never"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "can_delete",
     "params" : [
@@ -1932,7 +1816,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"can_delete: invalid argument.",
      __LINE__,
      {"can_delete", "invalid"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "can_delete",
     "params" : [
@@ -1949,7 +1832,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "can_delete",
          "4294967296",
      },
-     RPCCallTestData::no_exception,
      R"({
    "method" : "can_delete",
    "params" : [
@@ -1966,7 +1848,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "can_delete",
          "0123456701234567012345670123456701234567012345670123456701234567",
      },
-     RPCCallTestData::no_exception,
      R"({
    "method" : "can_delete",
    "params" : [
@@ -1985,7 +1866,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "secret_can_be_anything",
       "0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF",
       "18446744073709551615"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "channel_authorize",
     "params" : [
@@ -2004,7 +1884,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "secret_can_be_anything",
          "0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF",
      },
-     RPCCallTestData::no_exception,
      R"({
     "method" : "channel_authorize",
     "params" : [
@@ -2023,7 +1902,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "2000",
       "whatever",
       "whenever"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "channel_authorize",
     "params" : [
@@ -2041,7 +1919,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF",
       "2000",
       "whatever"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "channel_authorize",
     "params" : [
@@ -2058,7 +1935,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "secret_can_be_anything",
       "123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF",
       "2000"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "channel_authorize",
     "params" : [
@@ -2075,7 +1951,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "secret_can_be_anything",
       "10123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF",
       "2000"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "channel_authorize",
     "params" : [
@@ -2092,7 +1967,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "secret_can_be_anything",
       "0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEZ",
       "2000"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "channel_authorize",
     "params" : [
@@ -2109,7 +1983,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "secret_can_be_anything",
       "0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF",
       "-1"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "channel_authorize",
     "params" : [
@@ -2126,7 +1999,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "secret_can_be_anything",
       "0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF",
       "18446744073709551616"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "channel_authorize",
     "params" : [
@@ -2147,7 +2019,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF",
       "0",
       "DEADBEEF"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "channel_verify",
     "params" : [
@@ -2167,7 +2038,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF",
       "18446744073709551615",
       "DEADBEEF"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "channel_verify",
     "params" : [
@@ -2185,7 +2055,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {"channel_verify",
       "aB4BXXLuPu8DpVuyq1DBiu3SrPdtK9AYZisKhu8mvkoiUD8J9Gov",
       "0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "channel_verify",
     "params" : [
@@ -2204,7 +2073,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "2000",
       "DEADBEEF",
       "Whatever"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "channel_verify",
     "params" : [
@@ -2222,7 +2090,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF",
       "2000",
       "DEADBEEF"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "channel_verify",
     "params" : [
@@ -2240,7 +2107,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF",
       "2000",
       "DEADBEEF"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "channel_verify",
     "params" : [
@@ -2258,7 +2124,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "10123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF",
       "2000",
       "DEADBEEF"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "channel_verify",
     "params" : [
@@ -2276,7 +2141,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF",
       "2000",
       "DEADBEEF"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "channel_verify",
     "params" : [
@@ -2294,7 +2158,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF",
       "-1",
       "DEADBEEF"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "channel_verify",
     "params" : [
@@ -2312,7 +2175,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF",
       "18446744073709551616",
       "DEADBEEF"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "channel_verify",
     "params" : [
@@ -2330,7 +2192,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF",
       "40000000",
       "ThisIsNotHexadecimal"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "channel_verify",
     "params" : [
@@ -2352,7 +2213,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "connect",
          "ThereIsNoCheckingOnTheIPFormat",
      },
-     RPCCallTestData::no_exception,
      R"({
     "method" : "connect",
     "params" : [
@@ -2365,7 +2225,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"connect: ip and port.",
      __LINE__,
      {"connect", "ThereIsNoCheckingOnTheIPFormat", "6561"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "connect",
     "params" : [
@@ -2381,7 +2240,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "connect",
      },
-     RPCCallTestData::no_exception,
      R"({
     "method" : "connect",
     "params" : [
@@ -2395,7 +2253,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"connect: too many arguments.",
      __LINE__,
      {"connect", "ThereIsNoCheckingOnTheIPFormat", "6561", "extra"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "connect",
     "params" : [
@@ -2414,7 +2271,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "ThereIsNoCheckingOnTheIPFormat",
          "-1",
      },
-     RPCCallTestData::no_exception,
      R"({
    "method" : "connect",
    "params" : [
@@ -2432,7 +2288,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "ThereIsNoCheckingOnTheIPFormat",
          "4294967296",
      },
-     RPCCallTestData::no_exception,
      R"({
    "method" : "connect",
    "params" : [
@@ -2450,7 +2305,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "consensus_info",
      },
-     RPCCallTestData::no_exception,
      R"({
     "method" : "consensus_info",
     "params" : [
@@ -2462,7 +2316,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"consensus_info: too many arguments.",
      __LINE__,
      {"consensus_info", "whatever"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "consensus_info",
     "params" : [
@@ -2483,7 +2336,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "source_account_NotValidated",
          "destination_account_NotValidated",
      },
-     RPCCallTestData::no_exception,
      R"({
     "method" : "deposit_authorized",
     "params" : [
@@ -2500,7 +2352,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "source_account_NotValidated",
       "destination_account_NotValidated",
       "validated"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "deposit_authorized",
     "params" : [
@@ -2526,7 +2377,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "cred6",
       "cred7",
       "cred8"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "deposit_authorized",
     "params" : [
@@ -2545,7 +2395,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "source_account_NotValidated",
       "destination_account_NotValidated",
       "ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "deposit_authorized",
     "params" : [
@@ -2563,7 +2412,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "deposit_authorized",
          "source_account_NotValidated",
      },
-     RPCCallTestData::no_exception,
      R"({
     "method" : "deposit_authorized",
     "params" : [
@@ -2589,7 +2437,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "cred7",
       "cred8",
       "too_much"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "deposit_authorized",
     "params" : [
@@ -2608,7 +2455,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "destination_account_NotValidated",
          "NotALedger",
      },
-     RPCCallTestData::no_exception,
      R"({
     "method" : "deposit_authorized",
     "params" : [
@@ -2628,7 +2474,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "feature",
      },
-     RPCCallTestData::no_exception,
      R"({
     "method" : "feature",
     "params" : [
@@ -2640,7 +2485,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"feature: with name.",
      __LINE__,
      {"feature", "featureNameOrHexIsNotValidated"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "feature",
     "params" : [
@@ -2656,7 +2500,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "FEDCBA9876543210FEDCBA9876543210FEDCBA9876543210FEDCBA9876543210FEDCBA98"
       "76543210",
       "accept"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "feature",
     "params" : [
@@ -2670,7 +2513,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"feature: reject.",
      __LINE__,
      {"feature", "0", "reject"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "feature",
     "params" : [
@@ -2684,7 +2526,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"feature: too many arguments.",
      __LINE__,
      {"feature", "featureNameOrHexIsNotValidated", "accept", "anotherArg"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "feature",
     "params" : [
@@ -2702,7 +2543,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "featureNameOrHexIsNotValidated",
          "veto",
      },
-     RPCCallTestData::no_exception,
      R"({
     "method" : "feature",
     "params" : [
@@ -2721,7 +2561,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "fetch_info",
      },
-     RPCCallTestData::no_exception,
      R"({
     "method" : "fetch_info",
     "params" : [
@@ -2733,7 +2572,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"fetch_info: clear.",
      __LINE__,
      {"fetch_info", "clear"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "fetch_info",
     "params" : [
@@ -2746,7 +2584,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"fetch_info: too many arguments.",
      __LINE__,
      {"fetch_info", "clear", "other"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "fetch_info",
     "params" : [
@@ -2760,7 +2597,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"fetch_info: other trailing argument.",
      __LINE__,
      {"fetch_info", "too"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "fetch_info",
     "params" : [
@@ -2776,7 +2612,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"gateway_balances: minimal.",
      __LINE__,
      {"gateway_balances", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "gateway_balances",
     "params" : [
@@ -2789,7 +2624,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"gateway_balances: with ledger index.",
      __LINE__,
      {"gateway_balances", "890765", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "gateway_balances",
     "params" : [
@@ -2803,7 +2637,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"gateway_balances: with text ledger index.",
      __LINE__,
      {"gateway_balances", "current", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "gateway_balances",
     "params" : [
@@ -2819,7 +2652,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {"gateway_balances",
       "0123456789ABCDEFGHIJKLMNOPQRSTUV0123456789ABCDEFGHIJKLMNOPQRSTUV",
       "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "gateway_balances",
     "params" : [
@@ -2835,7 +2667,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {"gateway_balances",
       "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh",
       "hotwallet_is_not_validated"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "gateway_balances",
     "params" : [
@@ -2856,7 +2687,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "hotwallet_is_not_validated_2",
          "hotwallet_is_not_validated_3",
      },
-     RPCCallTestData::no_exception,
      R"({
     "method" : "gateway_balances",
     "params" : [
@@ -2877,7 +2707,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "gateway_balances",
      },
-     RPCCallTestData::no_exception,
      R"({
     "method" : "gateway_balances",
     "params" : [
@@ -2891,7 +2720,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"gateway_balances: empty first argument.",
      __LINE__,
      {"gateway_balances", ""},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "gateway_balances",
     "params" : [
@@ -2908,7 +2736,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "gateway_balances",
          "890765",
      },
-     RPCCallTestData::no_exception,
      R"({
     "method" : "gateway_balances",
     "params" : [
@@ -2925,7 +2752,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "gateway_balances",
          "current",
      },
-     RPCCallTestData::no_exception,
      R"({
     "method" : "gateway_balances",
     "params" : [
@@ -2942,7 +2768,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "gateway_balances",
          "0123456789ABCDEFGHIJKLMNOPQRSTUV0123456789ABCDEFGHIJKLMNOPQRSTUV",
      },
-     RPCCallTestData::no_exception,
      R"({
     "method" : "gateway_balances",
     "params" : [
@@ -2961,7 +2786,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "get_counts",
      },
-     RPCCallTestData::no_exception,
      R"({
     "method" : "get_counts",
     "params" : [
@@ -2973,7 +2797,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"get_counts: with maximum count.",
      __LINE__,
      {"get_counts", "100"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "get_counts",
     "params" : [
@@ -2986,7 +2809,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"get_counts: too many arguments.",
      __LINE__,
      {"get_counts", "100", "whatever"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "get_counts",
     "params" : [
@@ -3003,7 +2825,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "get_counts",
          "-1",
      },
-     RPCCallTestData::no_exception,
      R"({
     "method" : "get_counts",
     "params" : [
@@ -3017,7 +2838,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"get_counts: count too large.",
      __LINE__,
      {"get_counts", "4294967296"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "get_counts",
     "params" : [
@@ -3038,7 +2858,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "command",
          R"({"json_argument":true})",
      },
-     RPCCallTestData::no_exception,
      R"({
     "method" : "command",
     "params" : [
@@ -3056,7 +2875,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "command",
          R"({})",
      },
-     RPCCallTestData::no_exception,
      R"({
     "method" : "command",
     "params" : [
@@ -3069,7 +2887,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"json: too few arguments.",
      __LINE__,
      {"json", "command"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "json",
     "params" : [
@@ -3083,7 +2900,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"json: too many arguments.",
      __LINE__,
      {"json", "command", R"({"json_argument":true})", "extra"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "json",
     "params" : [
@@ -3101,7 +2917,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "command",
          R"(["arg1","arg2"])",
      },
-     RPCCallTestData::no_exception,
      R"({
     "method" : "json",
     "params" : [
@@ -3119,7 +2934,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "command",
          R"({"json_argument":true,})",
      },
-     RPCCallTestData::no_exception,
      R"({
     "method" : "json",
     "params" : [
@@ -3139,7 +2953,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "json2",
          R"({"jsonrpc":"2.0","ripplerpc":"2.0","id":"A1","method":"call_1"})",
      },
-     RPCCallTestData::no_exception,
      R"({
     "id" : "A1",
     "jsonrpc" : "2.0",
@@ -3167,7 +2980,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
         "params" : [{"inner_arg" : "yup"}]
         })",
      },
-     RPCCallTestData::no_exception,
      R"({
     "id" : "A1",
     "jsonrpc" : "2.0",
@@ -3192,7 +3004,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "json2",
          R"([{"jsonrpc":"2.0","ripplerpc":"2.0","id":"A1","method":"call_1"}])",
      },
-     RPCCallTestData::no_exception,
      R"({
     "method" : "json2",
     "params" : [
@@ -3219,7 +3030,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
         "params" : [{"inner_arg" : "yup"}]}
         ])",
      },
-     RPCCallTestData::no_exception,
      R"({
     "method" : "json2",
    "params" : [
@@ -3241,7 +3051,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "json2",
      },
-     RPCCallTestData::no_exception,
      R"({
     "method" : "json2",
     "params" : [
@@ -3257,7 +3066,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {"json2",
       R"({"jsonrpc":"2.0","ripplerpc":"2.0","id":"A1","method":"call_this"})",
       "extra"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "json2",
     "params" : [
@@ -3274,7 +3082,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "json2",
          R"({"jsonrpc":"2.0","ripplerpc":"2.0","id":"A1","method":"call_1",})",
      },
-     RPCCallTestData::no_exception,
      R"({
     "id" : "A1",
     "jsonrpc" : "2.0",
@@ -3297,7 +3104,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "json2",
          R"({"ripplerpc":"2.0","id":"A1","method":"call_1"})",
      },
-     RPCCallTestData::no_exception,
      R"({
     "id" : "A1",
     "method" : "json2",
@@ -3318,7 +3124,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "json2",
          R"({"jsonrpc":"2.1","ripplerpc":"2.0","id":"A1","method":"call_1"})",
      },
-     RPCCallTestData::no_exception,
      R"({
     "id" : "A1",
     "jsonrpc" : "2.1",
@@ -3341,7 +3146,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "json2",
          R"({"jsonrpc":"2.0","id":"A1","method":"call_1"})",
      },
-     RPCCallTestData::no_exception,
      R"({
     "id" : "A1",
     "jsonrpc" : "2.0",
@@ -3362,7 +3166,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "json2",
          R"({"jsonrpc":"2.0","ripplerpc":"2.00","id":"A1","method":"call_1"})",
      },
-     RPCCallTestData::no_exception,
      R"({
     "id" : "A1",
     "jsonrpc" : "2.0",
@@ -3385,7 +3188,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "json2",
          R"({"jsonrpc":"2.0","ripplerpc":"2.0","method":"call_1"})",
      },
-     RPCCallTestData::no_exception,
      R"({
     "jsonrpc" : "2.0",
     "method" : "json2",
@@ -3406,7 +3208,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "json2",
          R"({"jsonrpc":"2.0","ripplerpc":"2.0","id":"A1"})",
      },
-     RPCCallTestData::no_exception,
      R"({
     "id" : "A1",
     "jsonrpc" : "2.0",
@@ -3429,7 +3230,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "json2",
          R"([])",
      },
-     RPCCallTestData::no_exception,
      R"({
     "method" : "json2",
     "params" : [
@@ -3446,7 +3246,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "json2",
          R"([{"jsonrpc":"2.0","ripplerpc":"2.0","id":"A1","method":"call_1",[]}])",
      },
-     RPCCallTestData::no_exception,
      R"({
     "method" : "json2",
     "params" : [
@@ -3469,7 +3268,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
             }
         ])",
      },
-     RPCCallTestData::no_exception,
      R"({
     "method" : "json2",
     "params" : [
@@ -3492,7 +3290,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
         "params" : true
         })",
      },
-     RPCCallTestData::no_exception,
      R"({
    "id" : "A1",
    "jsonrpc" : "2.0",
@@ -3515,7 +3312,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"ledger: minimal.",
      __LINE__,
      {"ledger"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "ledger",
     "params" : [
@@ -3527,7 +3323,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"ledger: ledger index.",
      __LINE__,
      {"ledger", "4294967295"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "ledger",
     "params" : [
@@ -3540,7 +3335,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"ledger: text ledger index.",
      __LINE__,
      {"ledger", "validated"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "ledger",
     "params" : [
@@ -3554,7 +3348,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
      __LINE__,
      {"ledger",
       "ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "ledger",
     "params" : [
@@ -3567,7 +3360,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"ledger: full.",
      __LINE__,
      {"ledger", "current", "full"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "ledger",
     "params" : [
@@ -3581,7 +3373,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"ledger: tx.",
      __LINE__,
      {"ledger", "closed", "tx"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "ledger",
     "params" : [
@@ -3596,7 +3387,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"ledger: too many arguments.",
      __LINE__,
      {"ledger", "4294967295", "spare"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "ledger",
     "params" : [
@@ -3609,7 +3399,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"ledger: ledger index too small.",
      __LINE__,
      {"ledger", "-1"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "ledger",
     "params" : [
@@ -3622,7 +3411,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"ledger: ledger index too big.",
      __LINE__,
      {"ledger", "4294967296"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "ledger",
     "params" : [
@@ -3635,7 +3423,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"ledger: invalid ledger text.",
      __LINE__,
      {"ledger", "latest"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "ledger",
     "params" : [
@@ -3648,7 +3435,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"ledger: unsupported final argument.",
      __LINE__,
      {"ledger", "current", "expand"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "ledger",
     "params" : [
@@ -3664,7 +3450,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"ledger_closed: minimal.",
      __LINE__,
      {"ledger_closed"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "ledger_closed",
     "params" : [
@@ -3676,7 +3461,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"ledger_closed: too many arguments.",
      __LINE__,
      {"ledger_closed", "today"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "ledger_closed",
     "params" : [
@@ -3693,7 +3477,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"ledger_current: minimal.",
      __LINE__,
      {"ledger_current"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "ledger_current",
     "params" : [
@@ -3705,7 +3488,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"ledger_current: too many arguments.",
      __LINE__,
      {"ledger_current", "today"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "ledger_current",
     "params" : [
@@ -3722,7 +3504,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"ledger_header: ledger index.",
      __LINE__,
      {"ledger_header", "4294967295"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "ledger_header",
     "params" : [
@@ -3736,7 +3517,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
      __LINE__,
      {"ledger_header",
       "ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "ledger_header",
     "params" : [
@@ -3751,7 +3531,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "ledger_header",
      },
-     RPCCallTestData::no_exception,
      R"({
     "method" : "ledger_header",
     "params" : [
@@ -3765,7 +3544,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"ledger_header: too many arguments.",
      __LINE__,
      {"ledger_header", "4294967295", "spare"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "ledger_header",
     "params" : [
@@ -3779,7 +3557,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"ledger_header: text ledger index.",
      __LINE__,
      {"ledger_header", "current"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "ledger_header",
     "params" : [
@@ -3792,7 +3569,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"ledger_header: ledger index too small.",
      __LINE__,
      {"ledger_header", "-1"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "ledger_header",
     "params" : [
@@ -3805,7 +3581,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"ledger_header: ledger index too big.",
      __LINE__,
      {"ledger_header", "4294967296"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "ledger_header",
     "params" : [
@@ -3821,7 +3596,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"ledger_request: ledger index.",
      __LINE__,
      {"ledger_request", "4294967295"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "ledger_request",
     "params" : [
@@ -3835,7 +3609,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
      __LINE__,
      {"ledger_request",
       "ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "ledger_request",
     "params" : [
@@ -3850,7 +3623,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "ledger_request",
      },
-     RPCCallTestData::no_exception,
      R"({
     "method" : "ledger_request",
     "params" : [
@@ -3864,7 +3636,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"ledger_request: too many arguments.",
      __LINE__,
      {"ledger_request", "4294967295", "spare"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "ledger_request",
     "params" : [
@@ -3878,7 +3649,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"ledger_request: text ledger index.",
      __LINE__,
      {"ledger_request", "current"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "ledger_request",
     "params" : [
@@ -3891,7 +3661,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"ledger_request: ledger index too small.",
      __LINE__,
      {"ledger_request", "-1"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "ledger_request",
     "params" : [
@@ -3904,7 +3673,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"ledger_request: ledger index too big.",
      __LINE__,
      {"ledger_request", "4294967296"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "ledger_request",
     "params" : [
@@ -3922,7 +3690,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "log_level",
      },
-     RPCCallTestData::no_exception,
      R"({
     "method" : "log_level",
     "params" : [
@@ -3934,7 +3701,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"log_level: fatal.",
      __LINE__,
      {"log_level", "fatal"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "log_level",
     "params" : [
@@ -3947,7 +3713,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"log_level: error.",
      __LINE__,
      {"log_level", "error"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "log_level",
     "params" : [
@@ -3960,7 +3725,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"log_level: warn.",
      __LINE__,
      {"log_level", "warn"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "log_level",
     "params" : [
@@ -3973,7 +3737,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"log_level: debug.",
      __LINE__,
      {"log_level", "debug"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "log_level",
     "params" : [
@@ -3986,7 +3749,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"log_level: trace.",
      __LINE__,
      {"log_level", "trace"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "log_level",
     "params" : [
@@ -3999,7 +3761,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"log_level: base partition.",
      __LINE__,
      {"log_level", "base", "trace"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "log_level",
     "params" : [
@@ -4013,7 +3774,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"log_level: partiton_name.",
      __LINE__,
      {"log_level", "partition_name", "fatal"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "log_level",
     "params" : [
@@ -4027,7 +3787,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"log_level: too many arguments.",
      __LINE__,
      {"log_level", "partition_name", "fatal", "extra"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "log_level",
     "params" : [
@@ -4041,7 +3800,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"log_level: invalid severity.",
      __LINE__,
      {"log_level", "err"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "log_level",
     "params" : [
@@ -4058,7 +3816,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "fatal",
          "partition_name",
      },
-     RPCCallTestData::no_exception,
      R"({
     "method" : "log_level",
     "params" : [
@@ -4077,7 +3834,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "logrotate",
      },
-     RPCCallTestData::no_exception,
      R"({
     "method" : "logrotate",
     "params" : [
@@ -4089,7 +3845,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"logrotate: too many arguments.",
      __LINE__,
      {"logrotate", "extra"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "logrotate",
     "params" : [
@@ -4106,7 +3861,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"owner_info: minimal.",
      __LINE__,
      {"owner_info", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "owner_info",
     "params" : [
@@ -4119,7 +3873,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"owner_info: with numeric ledger index.",
      __LINE__,
      {"owner_info", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh", "987654321"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "owner_info",
     "params" : [
@@ -4133,7 +3886,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"owner_info: with text ledger index.",
      __LINE__,
      {"owner_info", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh", "validated"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "owner_info",
     "params" : [
@@ -4149,7 +3901,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {"owner_info",
       "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh",
       "0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "owner_info",
     "params" : [
@@ -4163,7 +3914,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"owner_info: with ledger index.",
      __LINE__,
      {"owner_info", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh", "validated"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "owner_info",
     "params" : [
@@ -4179,7 +3929,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "owner_info",
      },
-     RPCCallTestData::no_exception,
      R"({
     "method" : "owner_info",
     "params" : [
@@ -4199,7 +3948,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "extra1",
          "extra2",
      },
-     RPCCallTestData::no_exception,
      R"({
     "method" : "owner_info",
     "params" : [
@@ -4217,7 +3965,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
             "owner_info",
             "",  // Note: very few values are detected as bad!
         },
-        RPCCallTestData::no_exception,
         R"({
     "method" : "owner_info",
     "params" : [
@@ -4235,7 +3982,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
         "owner_info: invalid ledger selection.",
         __LINE__,
         {"owner_info", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh", "no_ledger"},
-        RPCCallTestData::no_exception,
         R"({
     "method" : "owner_info",
     "params" : [
@@ -4253,7 +3999,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
         "owner_info: invalid ledger selection.",
         __LINE__,
         {"owner_info", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh", "no_ledger"},
-        RPCCallTestData::no_exception,
         R"({
     "method" : "owner_info",
     "params" : [
@@ -4273,7 +4018,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "peers",
      },
-     RPCCallTestData::no_exception,
      R"({
     "method" : "peers",
     "params" : [
@@ -4285,7 +4029,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"peers: too many arguments.",
      __LINE__,
      {"peers", "extra"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "peers",
     "params" : [
@@ -4302,7 +4045,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"peer_reservations_add: minimal.",
      __LINE__,
      {"peer_reservations_add", "public_key_string"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "peer_reservations_add",
     "params" : [
@@ -4315,7 +4057,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"peer_reservations_add: with description.",
      __LINE__,
      {"peer_reservations_add", "public_key_string", "public_key_description"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "peer_reservations_add",
     "params" : [
@@ -4329,7 +4070,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"peer_reservations_add: too few arguments.",
      __LINE__,
      {"peer_reservations_add"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "peer_reservations_add",
     "params" : [
@@ -4346,7 +4086,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "public_key_string",
       "public_key_description",
       "spare"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "peer_reservations_add",
     "params" : [
@@ -4363,7 +4102,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"peer_reservations_del: minimal.",
      __LINE__,
      {"peer_reservations_del", "public_key_string"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "peer_reservations_del",
     "params" : [
@@ -4376,7 +4114,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"peer_reservations_del: too few arguments.",
      __LINE__,
      {"peer_reservations_del"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "peer_reservations_del",
     "params" : [
@@ -4393,7 +4130,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "public_key_string",
       "public_key_description",
       "spare"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "peer_reservations_del",
     "params" : [
@@ -4412,7 +4148,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "ping",
      },
-     RPCCallTestData::no_exception,
      R"({
     "method" : "ping",
     "params" : [
@@ -4424,7 +4159,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"ping: too many arguments.",
      __LINE__,
      {"ping", "extra"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "ping",
     "params" : [
@@ -4443,7 +4177,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "print",
      },
-     RPCCallTestData::no_exception,
      R"({
     "method" : "print",
     "params" : [
@@ -4456,7 +4189,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
      "print: extra argument.",
      __LINE__,
      {"print", "extra"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "print",
     "params" : [
@@ -4469,7 +4201,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"print: too many arguments.",
      __LINE__,
      {"print", "extra1", "extra2"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "print",
     "params" : [
@@ -4488,7 +4219,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "random",
      },
-     RPCCallTestData::no_exception,
      R"({
     "method" : "random",
     "params" : [
@@ -4500,7 +4230,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"random: too many arguments.",
      __LINE__,
      {"random", "extra"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "random",
     "params" : [
@@ -4520,7 +4249,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "ripple_path_find",
          R"({"json_argument":true})",
      },
-     RPCCallTestData::no_exception,
      R"({
     "method" : "ripple_path_find",
     "params" : [
@@ -4533,7 +4261,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"ripple_path_find: ledger index.",
      __LINE__,
      {"ripple_path_find", R"({"json_argument":true})", "4294967295"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "ripple_path_find",
     "params" : [
@@ -4547,7 +4274,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"ripple_path_find: text ledger index.",
      __LINE__,
      {"ripple_path_find", R"({"json_argument":true})", "closed"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "ripple_path_find",
     "params" : [
@@ -4563,7 +4289,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {"ripple_path_find",
       R"({"json_argument":true})",
       "0123456789ABCDEFGHIJKLMNOPQRSTUV0123456789ABCDEFGHIJKLMNOPQRSTUV"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "ripple_path_find",
     "params" : [
@@ -4580,7 +4305,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "ripple_path_find",
      },
-     RPCCallTestData::no_exception,
      R"({
     "method" : "ripple_path_find",
     "params" : [
@@ -4594,7 +4318,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"ripple_path_find: too many arguments.",
      __LINE__,
      {"ripple_path_find", R"({"json_argument":true})", "current", "extra"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "ripple_path_find",
     "params" : [
@@ -4611,7 +4334,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "ripple_path_find",
          R"({"json_argument":true,})",
      },
-     RPCCallTestData::no_exception,
      R"({
     "method" : "ripple_path_find",
     "params" : [
@@ -4625,7 +4347,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"ripple_path_find: ledger index too small.",
      __LINE__,
      {"ripple_path_find", R"({"json_argument":true})", "-1"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "ripple_path_find",
     "params" : [
@@ -4639,7 +4360,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"ripple_path_find: ledger index too big.",
      __LINE__,
      {"ripple_path_find", R"({"json_argument":true})", "4294967296"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "ripple_path_find",
     "params" : [
@@ -4653,7 +4373,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"ripple_path_find: invalid text ledger index.",
      __LINE__,
      {"ripple_path_find", R"({"json_argument":true})", "cur"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "ripple_path_find",
     "params" : [
@@ -4674,7 +4393,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "my_secret",
          R"({"json_argument":true})",
      },
-     RPCCallTestData::no_exception,
      R"({
     "method" : "sign",
     "params" : [
@@ -4690,7 +4408,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"sign: offline.",
      __LINE__,
      {"sign", "my_secret", R"({"json_argument":true})", "offline"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "sign",
     "params" : [
@@ -4707,7 +4424,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"sign: too few arguments.",
      __LINE__,
      {"sign", "contents_of_blob"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "sign",
     "params" : [
@@ -4721,7 +4437,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"sign: offline flag with signature_target.",
      __LINE__,
      {"sign", "my_secret", R"({"json_argument":true})", "offline", "extra"},
-     RPCCallTestData::no_exception,
      R"({
         "method" : "sign",
         "params" : [
@@ -4745,7 +4460,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "offline",
       "CounterpartySignature",
       "extra"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "sign",
     "params" : [
@@ -4763,7 +4477,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "my_secret",
          R"({"json_argument":true,})",
      },
-     RPCCallTestData::no_exception,
      R"({
     "method" : "sign",
     "params" : [
@@ -4777,7 +4490,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"sign: misspelled offline flag interpreted as signature_target.",
      __LINE__,
      {"sign", "my_secret", R"({"json_argument":true})", "offlin"},
-     RPCCallTestData::no_exception,
      R"({
         "method" : "sign",
         "params" : [
@@ -4803,7 +4515,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "my_secret",
          R"({"json_argument":true})",
      },
-     RPCCallTestData::no_exception,
      R"({
     "method" : "sign_for",
     "params" : [
@@ -4824,7 +4535,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "my_secret",
       R"({"json_argument":true})",
       "offline"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "sign_for",
     "params" : [
@@ -4846,7 +4556,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh",
          "my_secret",
      },
-     RPCCallTestData::no_exception,
      R"({
     "method" : "sign_for",
     "params" : [
@@ -4865,7 +4574,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
       R"({"json_argument":true})",
       "offline",
       "extra"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "sign_for",
     "params" : [
@@ -4884,7 +4592,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "my_secret",
          R"({"json_argument":true,})",
      },
-     RPCCallTestData::no_exception,
      R"({
     "method" : "sign_for",
     "params" : [
@@ -4902,7 +4609,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "my_secret",
       R"({"json_argument":true})",
       "ofline"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "sign_for",
     "params" : [
@@ -4919,7 +4625,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"submit: blob.",
      __LINE__,
      {"submit", "the blob is unvalidated and may be any length..."},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "submit",
     "params" : [
@@ -4936,7 +4641,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "my_secret",
          R"({"json_argument":true})",
      },
-     RPCCallTestData::no_exception,
      R"({
     "method" : "submit",
     "params" : [
@@ -4954,7 +4658,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "submit",
      },
-     RPCCallTestData::no_exception,
      R"({
     "method" : "submit",
     "params" : [
@@ -4969,7 +4672,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
      "submit: four arguments.",
      __LINE__,
      {"submit", "my_secret", R"({"json_argument":true})", "offline"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "submit",
     "params" : [
@@ -4986,7 +4688,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"submit: offline flag with signature_target.",
      __LINE__,
      {"submit", "my_secret", R"({"json_argument":true})", "offline", "extra"},
-     RPCCallTestData::no_exception,
      R"({
         "method" : "submit",
         "params" : [
@@ -5010,7 +4711,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "offline",
       "CounterpartySignature",
       "extra"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "submit",
     "params" : [
@@ -5028,7 +4728,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "my_secret",
          R"({"json_argument":true,})",
      },
-     RPCCallTestData::no_exception,
      R"({
     "method" : "submit",
     "params" : [
@@ -5042,7 +4741,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"submit: misspelled offline flag interpreted as signature_target.",
      __LINE__,
      {"submit", "my_secret", R"({"json_argument":true})", "offlne"},
-     RPCCallTestData::no_exception,
      R"({
         "method" : "submit",
         "params" : [
@@ -5066,7 +4764,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "submit_multisigned",
          R"({"json_argument":true})",
      },
-     RPCCallTestData::no_exception,
      R"({
     "method" : "submit_multisigned",
     "params" : [
@@ -5083,7 +4780,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "submit_multisigned",
      },
-     RPCCallTestData::no_exception,
      R"({
     "method" : "submit_multisigned",
     "params" : [
@@ -5097,7 +4793,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"submit_multisigned: too many arguments.",
      __LINE__,
      {"submit_multisigned", R"({"json_argument":true})", "extra"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "submit_multisigned",
     "params" : [
@@ -5114,7 +4809,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "submit_multisigned",
          R"({"json_argument":true,})",
      },
-     RPCCallTestData::no_exception,
      R"({
     "method" : "submit_multisigned",
     "params" : [
@@ -5134,7 +4828,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "server_info",
      },
-     RPCCallTestData::no_exception,
      R"({
     "method" : "server_info",
     "params" : [
@@ -5146,7 +4839,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"server_info: counters.",
      __LINE__,
      {"server_info", "counters"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "server_info",
     "params" : [
@@ -5159,7 +4851,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"server_info: too many arguments.",
      __LINE__,
      {"server_info", "counters", "extra"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "server_info",
     "params" : [
@@ -5173,7 +4864,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"server_info: non-counters argument.",
      __LINE__,
      {"server_info", "counter"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "server_info",
     "params" : [
@@ -5190,7 +4880,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "server_state",
      },
-     RPCCallTestData::no_exception,
      R"({
     "method" : "server_state",
     "params" : [
@@ -5202,7 +4891,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"server_state: counters.",
      __LINE__,
      {"server_state", "counters"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "server_state",
     "params" : [
@@ -5215,7 +4903,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"server_state: too many arguments.",
      __LINE__,
      {"server_state", "counters", "extra"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "server_state",
     "params" : [
@@ -5229,7 +4916,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"server_state: non-counters argument.",
      __LINE__,
      {"server_state", "counter"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "server_state",
     "params" : [
@@ -5246,7 +4932,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "stop",
      },
-     RPCCallTestData::no_exception,
      R"({
     "method" : "stop",
     "params" : [
@@ -5258,7 +4943,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"stop: too many arguments.",
      __LINE__,
      {"stop", "extra"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "stop",
     "params" : [
@@ -5277,7 +4961,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {"transaction_entry",
       "0123456789ABCDEFGHIJKLMNOPQRSTUV0123456789ABCDEFGHIJKLMNOPQRSTUV",
       "4294967295"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "transaction_entry",
     "params" : [
@@ -5293,7 +4976,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {"transaction_entry",
       "0123456789ABCDEFGHIJKLMNOPQRSTUV0123456789ABCDEFGHIJKLMNOPQRSTUV",
       "current"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "transaction_entry",
     "params" : [
@@ -5309,7 +4991,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {"transaction_entry",
       "0123456789ABCDEFGHIJKLMNOPQRSTUV0123456789ABCDEFGHIJKLMNOPQRSTUV",
       "VUTSRQPONMLKJIHGFEDCBA9876543210VUTSRQPONMLKJIHGFEDCBA9876543210"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "transaction_entry",
     "params" : [
@@ -5326,7 +5007,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "transaction_entry",
          "0123456789ABCDEFGHIJKLMNOPQRSTUV0123456789ABCDEFGHIJKLMNOPQRSTUV",
      },
-     RPCCallTestData::no_exception,
      R"({
     "method" : "transaction_entry",
     "params" : [
@@ -5343,7 +5023,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "0123456789ABCDEFGHIJKLMNOPQRSTUV0123456789ABCDEFGHIJKLMNOPQRSTUV",
       "validated",
       "extra"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "transaction_entry",
     "params" : [
@@ -5361,7 +5040,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "123456789ABCDEFGHIJKLMNOPQRSTUV0123456789ABCDEFGHIJKLMNOPQRSTUV",
          "validated",
      },
-     RPCCallTestData::no_exception,
      R"({
     "method" : "transaction_entry",
     "params" : [
@@ -5379,7 +5057,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "0123456789ABCDEFGHIJKLMNOPQRSTUV0123456789ABCDEFGHIJKLMNOPQRSTUVW",
          "validated",
      },
-     RPCCallTestData::no_exception,
      R"({
     "method" : "transaction_entry",
     "params" : [
@@ -5397,7 +5074,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "0123456789ABCDEFGHIJKLMNOPQRSTUV0123456789ABCDEFGHIJKLMNOPQRSTUV",
          "0",
      },
-     RPCCallTestData::no_exception,
      R"({
     "method" : "transaction_entry",
     "params" : [
@@ -5415,7 +5091,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "0123456789ABCDEFGHIJKLMNOPQRSTUV0123456789ABCDEFGHIJKLMNOPQRSTUV",
          "4294967296",
      },
-     RPCCallTestData::no_exception,
      R"({
     "method" : "transaction_entry",
     "params" : [
@@ -5433,7 +5108,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "0123456789ABCDEFGHIJKLMNOPQRSTUV0123456789ABCDEFGHIJKLMNOPQRSTUV",
          "VUTSRQPONMLKJIHGFEDCBA9876543210VUTSRQPONMLKJIHGFEDCBA987654321",
      },
-     RPCCallTestData::no_exception,
      R"({
     "method" : "transaction_entry",
     "params" : [
@@ -5451,7 +5125,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "0123456789ABCDEFGHIJKLMNOPQRSTUV0123456789ABCDEFGHIJKLMNOPQRSTUV",
          "VUTSRQPONMLKJIHGFEDCBA9876543210VUTSRQPONMLKJIHGFEDCBA9876543210Z",
      },
-     RPCCallTestData::no_exception,
      R"({
     "method" : "transaction_entry",
     "params" : [
@@ -5468,7 +5141,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"tx: ctid. minimal",
      __LINE__,
      {"tx", "FFFFFFFFFFFFFFFF", "1", "2"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "tx",
     "params" : [
@@ -5483,7 +5155,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"tx: ctid. binary",
      __LINE__,
      {"tx", "FFFFFFFFFFFFFFFF", "binary", "1", "2"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "tx",
     "params" : [
@@ -5499,7 +5170,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"tx: minimal.",
      __LINE__,
      {"tx", "transaction_hash_is_not_validated"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "tx",
     "params" : [
@@ -5512,7 +5182,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"tx: binary.",
      __LINE__,
      {"tx", "transaction_hash_is_not_validated", "binary"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "tx",
     "params" : [
@@ -5528,7 +5197,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "tx",
      },
-     RPCCallTestData::no_exception,
      R"({
     "method" : "tx",
     "params" : [
@@ -5542,7 +5210,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"tx: too many arguments.",
      __LINE__,
      {"tx", "transaction_hash_is_not_validated", "binary", "1", "2", "extra"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "tx",
     "params" : [
@@ -5556,7 +5223,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"tx: invalid final argument is apparently ignored.",
      __LINE__,
      {"tx", "transaction_hash_is_not_validated", "bin"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "tx",
     "params" : [
@@ -5572,7 +5238,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"tx_history: minimal.",
      __LINE__,
      {"tx_history", "0"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "tx_history",
     "params" : [
@@ -5587,7 +5252,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "tx_history",
      },
-     RPCCallTestData::no_exception,
      R"({
     "method" : "tx_history",
     "params" : [
@@ -5601,7 +5265,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"tx_history: too many arguments.",
      __LINE__,
      {"tx_history", "0", "1"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "tx_history",
     "params" : [
@@ -5617,7 +5280,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
         "tx_history: start too small.",
         __LINE__,
         {"tx_history", "-1"},
-        RPCCallTestData::no_exception,
         R"({
     "method" : "tx_history",
     "params" : [
@@ -5634,7 +5296,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
         "tx_history: start too big.",
         __LINE__,
         {"tx_history", "4294967296"},
-        RPCCallTestData::no_exception,
         R"({
     "method" : "tx_history",
     "params" : [
@@ -5651,7 +5312,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
         "tx_history: start not integer.",
         __LINE__,
         {"tx_history", "beginning"},
-        RPCCallTestData::no_exception,
         R"({
     "method" : "tx_history",
     "params" : [
@@ -5671,7 +5331,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "unl_list",
      },
-     RPCCallTestData::no_exception,
      R"({
     "method" : "unl_list",
     "params" : [
@@ -5683,7 +5342,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"unl_list: too many arguments.",
      __LINE__,
      {"unl_list", "extra"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "unl_list",
     "params" : [
@@ -5702,7 +5360,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "validation_create",
      },
-     RPCCallTestData::no_exception,
      R"({
     "method" : "validation_create",
     "params" : [
@@ -5714,7 +5371,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"validation_create: with secret.",
      __LINE__,
      {"validation_create", "the form of the secret is not validated"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "validation_create",
     "params" : [
@@ -5727,7 +5383,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"validation_create: too many arguments.",
      __LINE__,
      {"validation_create", "the form of the secret is not validated", "extra"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "validation_create",
     "params" : [
@@ -5746,7 +5401,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "version",
      },
-     RPCCallTestData::no_exception,
      R"({
     "method" : "version",
     "params" : [
@@ -5758,7 +5412,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"version: too many arguments.",
      __LINE__,
      {"version", "extra"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "version",
     "params" : [
@@ -5777,7 +5430,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "wallet_propose",
      },
-     RPCCallTestData::no_exception,
      R"({
     "method" : "wallet_propose",
     "params" : [
@@ -5789,7 +5441,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"wallet_propose: with passphrase.",
      __LINE__,
      {"wallet_propose", "the form of the passphrase is not validated"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "wallet_propose",
     "params" : [
@@ -5802,7 +5453,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"wallet_propose: too many arguments.",
      __LINE__,
      {"wallet_propose", "the form of the passphrase is not validated", "extra"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "wallet_propose",
     "params" : [
@@ -5819,7 +5469,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"internal: minimal.",
      __LINE__,
      {"internal", "command_name"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "internal",
     "params" : [
@@ -5839,7 +5488,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "-1",
       "4294967296",
       "3.14159"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "internal",
     "params" : [
@@ -5855,7 +5503,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "internal",
      },
-     RPCCallTestData::no_exception,
      R"({
     "method" : "internal",
     "params" : [
@@ -5874,7 +5521,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "path_find",
      },
-     RPCCallTestData::no_exception,
      R"({
     "method" : "path_find",
     "params" : [
@@ -5888,7 +5534,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"path_find: with arguments.",
      __LINE__,
      {"path_find", "string_arg", "1", "-1", "4294967296", "3.14159"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "path_find",
     "params" : [
@@ -5907,7 +5552,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "subscribe",
      },
-     RPCCallTestData::no_exception,
      R"({
     "method" : "subscribe",
     "params" : [
@@ -5921,7 +5565,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"subscribe: with arguments.",
      __LINE__,
      {"subscribe", "string_arg", "1", "-1", "4294967296", "3.14159"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "subscribe",
     "params" : [
@@ -5940,7 +5583,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "unsubscribe",
      },
-     RPCCallTestData::no_exception,
      R"({
     "method" : "unsubscribe",
     "params" : [
@@ -5954,7 +5596,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"unsubscribe: with arguments.",
      __LINE__,
      {"unsubscribe", "string_arg", "1", "-1", "4294967296", "3.14159"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "unsubscribe",
     "params" : [
@@ -5973,7 +5614,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "unknown_command",
      },
-     RPCCallTestData::no_exception,
      R"({
     "method" : "unknown_command",
     "params" : [
@@ -5985,7 +5625,6 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"unknown_command: with arguments.",
      __LINE__,
      {"unknown_command", "string_arg", "1", "-1", "4294967296", "3.14159"},
-     RPCCallTestData::no_exception,
      R"({
     "method" : "unknown_command",
     "params" : [
@@ -6056,15 +5695,7 @@ public:
             }
             catch (std::bad_cast const&)
             {
-                if ((rpcCallTest.throwsWhat == RPCCallTestData::bad_cast) &&
-                    (std::strlen(expVersioned) == 0))
-                {
-                    pass();
-                }
-                else
-                {
-                    fail(rpcCallTest.description, __FILE__, rpcCallTest.line);
-                }
+                fail(rpcCallTest.description, __FILE__, rpcCallTest.line);
                 // Try the next test.
                 continue;
             }
@@ -6087,13 +5718,16 @@ public:
             rmErrorCode(exp);
 
             // Pass if we didn't expect a throw and we got what we expected.
-            if ((rpcCallTest.throwsWhat == RPCCallTestData::no_exception) &&
-                (got == exp))
+            if (got == exp)
             {
                 pass();
             }
             else
             {
+                std::cout << "no match: " << rpcCallTest.description
+                          << std::endl;
+                std::cout << "  got: " << got.toStyledString() << std::endl;
+                std::cout << "  exp: " << exp.toStyledString() << std::endl;
                 fail(rpcCallTest.description, __FILE__, rpcCallTest.line);
             }
         }