diff --git a/Base/src/ecflow/base/ClientOptionsParser.cpp b/Base/src/ecflow/base/ClientOptionsParser.cpp
index e8043feb8..9db3c4e89 100644
--- a/Base/src/ecflow/base/ClientOptionsParser.cpp
+++ b/Base/src/ecflow/base/ClientOptionsParser.cpp
@@ -23,9 +23,17 @@ bool is_valid_path(const std::string& path) {
 void parse_option(ClientOptionsParser::option_t& option,
                   ClientOptionsParser::option_set_t& processed_options,
                   ClientOptionsParser::arguments_set_t& args) {
+    // We must consider two forms of options:
+    //     1) --<option> <arg1>
+    //     2) --<option>=<arg1>
+
     if (auto found = args[0].find('='); found == std::string::npos) {
         // In case form 1) is used, we discard the '--<option>'
         args.erase(args.begin());
+        if (args.empty()) {
+            // This means that the option doesn't actually have a value (i.e. acts as a flag) and we simply return
+            return;
+        }
         // store the 'arg1'
         option.value.push_back(args.front());
         option.original_tokens.push_back(args.front());
@@ -91,6 +99,7 @@ void parse_alter(ClientOptionsParser::option_set_t& processed_options, ClientOpt
 
     ClientOptionsParser::option_t alter{std::string{"alter"}, {}};
 
+    // This effectively always collects an argument (i.e. the operation)
     parse_option(alter, processed_options, args);
 
     // Collect up to 4 positional arguments, that are not paths
@@ -109,7 +118,7 @@ void parse_alter(ClientOptionsParser::option_set_t& processed_options, ClientOpt
 void parse_label(ClientOptionsParser::option_set_t& processed_options, ClientOptionsParser::arguments_set_t& args) {
 
     // *** Important! ***
-    // This custom handler is needed to ensure that the "--alter" option
+    // This custom handler is needed to ensure that the "--label" option
     // special value parameters are handled correctly. For example,
     // values starting with -, such as "-j64".
     //
@@ -121,6 +130,7 @@ void parse_label(ClientOptionsParser::option_set_t& processed_options, ClientOpt
 
     ClientOptionsParser::option_t label{std::string{"label"}, {}};
 
+    // This effectively always collects an argument (i.e. the label name)
     parse_option(label, processed_options, args);
 
     // Collect 1 positional argument (i.e. the label value)
@@ -129,6 +139,51 @@ void parse_label(ClientOptionsParser::option_set_t& processed_options, ClientOpt
     processed_options.push_back(label);
 }
 
+void parse_meter(ClientOptionsParser::option_set_t& processed_options, ClientOptionsParser::arguments_set_t& args) {
+
+    // *** Important! ***
+    // This custom handler is needed to ensure that the "--meter" option
+    // special value parameters are handled correctly. For example,
+    // values starting with -, such as "-1".
+    //
+    // The custom handling will consider that 2 positional values (not
+    // to be confused with positional arguments) are provided with the
+    // --label option, as per one of the following forms:
+    //     1) --label arg1 arg2
+    //     2) --label=arg1 arg2
+
+    ClientOptionsParser::option_t meter{std::string{"meter"}, {}};
+
+    // This effectively always collects an argument (i.e. the meter name)
+    parse_option(meter, processed_options, args);
+
+    // Collect 1 positional argument (i.e. the meter value)
+    parse_positional_arguments(meter, processed_options, args, 1);
+
+    processed_options.push_back(meter);
+}
+
+void parse_abort(ClientOptionsParser::option_set_t& processed_options, ClientOptionsParser::arguments_set_t& args) {
+
+    // *** Important! ***
+    // This custom handler is needed to ensure that the "--abort" option
+    // special value parameters are handled correctly. For example,
+    // values starting with -, such as "--some reason--".
+    //
+    // The custom handling will consider that 2 positional values (not
+    // to be confused with positional arguments) are provided with the
+    // --label option, as per one of the following forms:
+    //     1) --label arg1 arg2
+    //     2) --label=arg1 arg2
+
+    ClientOptionsParser::option_t abort{std::string{"abort"}, {}};
+
+    // This effectively always collects an argument (i.e. the reason text)
+    parse_option(abort, processed_options, args);
+
+    processed_options.push_back(abort);
+}
+
 } // namespace
 
 ClientOptionsParser::option_set_t ClientOptionsParser::operator()(ClientOptionsParser::arguments_set_t& args) {
@@ -140,6 +195,12 @@ ClientOptionsParser::option_set_t ClientOptionsParser::operator()(ClientOptionsP
     else if (ecf::algorithm::starts_with(args[0], "--label")) {
         parse_label(processed_options, args);
     }
+    else if (ecf::algorithm::starts_with(args[0], "--meter")) {
+        parse_meter(processed_options, args);
+    }
+    else if (ecf::algorithm::starts_with(args[0], "--abort")) {
+        parse_abort(processed_options, args);
+    }
     return processed_options;
 }
 
diff --git a/Base/src/ecflow/base/cts/task/MeterCmd.cpp b/Base/src/ecflow/base/cts/task/MeterCmd.cpp
index 963e43b0f..a6a890f95 100644
--- a/Base/src/ecflow/base/cts/task/MeterCmd.cpp
+++ b/Base/src/ecflow/base/cts/task/MeterCmd.cpp
@@ -122,6 +122,10 @@ void MeterCmd::create(Cmd_ptr& cmd, boost::program_options::variables_map& vm, A
         throw std::runtime_error(ss.str());
     }
 
+    if (args[0].empty()) {
+        throw std::runtime_error("MeterCmd: First argument must be a non-empty string, i.e. --meter=name 100\n");
+    }
+
     int value = 0;
     try {
         std::string strVal = args[1];
diff --git a/Base/src/ecflow/base/cts/task/QueueCmd.cpp b/Base/src/ecflow/base/cts/task/QueueCmd.cpp
index e4fbc9de1..30468cdff 100644
--- a/Base/src/ecflow/base/cts/task/QueueCmd.cpp
+++ b/Base/src/ecflow/base/cts/task/QueueCmd.cpp
@@ -166,7 +166,7 @@ const char* QueueCmd::desc() {
            "definition\n"
            "     no_of_aborted: returns number of aborted steps as a string, i.e 10\n"
            "     reset: sets the index to the first queued/aborted step. Allows steps to be reprocessed for errors\n"
-           "  arg2(string) = step: value returned from step=$(ecflow_client --queue=queue_name active)\n"
+           "  arg3(string) = step: value returned from step=$(ecflow_client --queue=queue_name active)\n"
            "                This is only valid for complete and aborted steps\n"
            "  arg4(string) = path: (optional). The path where the queue is defined.\n"
            "                 By default we search for the queue up the node tree.\n\n"
diff --git a/Base/src/ecflow/base/cts/user/BeginCmd.cpp b/Base/src/ecflow/base/cts/user/BeginCmd.cpp
index 85c0c1877..7d4ea21d8 100644
--- a/Base/src/ecflow/base/cts/user/BeginCmd.cpp
+++ b/Base/src/ecflow/base/cts/user/BeginCmd.cpp
@@ -136,6 +136,7 @@ void BeginCmd::addOption(boost::program_options::options_description& desc) cons
 }
 void BeginCmd::create(Cmd_ptr& cmd, boost::program_options::variables_map& vm, AbstractClientEnv* ace) const {
     std::string beginArg = vm[arg()].as<std::string>();
+    Str::removeQuotes(beginArg);
 
     if (ace->debug()) {
         cout << "  BeginCmd::create arg = " << beginArg << "\n";
diff --git a/CMakeLists.txt b/CMakeLists.txt
index afe3b1007..f2d39e5d6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,7 +25,7 @@ endif()
 find_package( ecbuild 3.4 REQUIRED HINTS ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../ecbuild ) # Before project()  
 
 # this will generate variables, see ACore/ecflow_version.h.in
-project( ecflow LANGUAGES CXX VERSION 5.12.2 )
+project( ecflow LANGUAGES CXX VERSION 5.12.3 )
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake)
 
diff --git a/Client/test/TestClientOptions.cpp b/Client/test/TestClientOptions.cpp
index 9de2586af..a4cfc28e0 100644
--- a/Client/test/TestClientOptions.cpp
+++ b/Client/test/TestClientOptions.cpp
@@ -10,8 +10,17 @@
 
 #include <boost/test/unit_test.hpp>
 
+#include "ecflow/base/cts/task/AbortCmd.hpp"
+#include "ecflow/base/cts/task/CompleteCmd.hpp"
+#include "ecflow/base/cts/task/CtsWaitCmd.hpp"
+#include "ecflow/base/cts/task/EventCmd.hpp"
+#include "ecflow/base/cts/task/InitCmd.hpp"
 #include "ecflow/base/cts/task/LabelCmd.hpp"
+#include "ecflow/base/cts/task/MeterCmd.hpp"
+#include "ecflow/base/cts/task/QueueCmd.hpp"
 #include "ecflow/base/cts/user/AlterCmd.hpp"
+#include "ecflow/base/cts/user/BeginCmd.hpp"
+#include "ecflow/base/cts/user/PathsCmd.hpp"
 #include "ecflow/client/ClientEnvironment.hpp"
 #include "ecflow/client/ClientInvoker.hpp"
 #include "ecflow/client/ClientOptions.hpp"
@@ -22,42 +31,42 @@
 /// \brief Tests the capabilities of ClientOptions
 ///
 
-template <typename REQUIRE>
-void test_label(const CommandLine& cl, REQUIRE check) {
+template <typename COMMAND, typename REQUIRE>
+void test_user_command(const CommandLine& cl, REQUIRE check) {
     std::cout << "Testing command line: " << cl.original() << std::endl;
 
     ClientOptions options;
     ClientEnvironment environment(false);
-    // Setup environment with some defaults
-    environment.set_child_path("/path/to/child");
-    environment.set_child_password("password");
     try {
         auto base_command    = options.parse(cl, &environment);
-        auto derived_command = dynamic_cast<LabelCmd*>(base_command.get());
+        auto derived_command = dynamic_cast<COMMAND*>(base_command.get());
 
         BOOST_REQUIRE(derived_command);
         check(*derived_command, environment);
     }
     catch (boost::program_options::unknown_option& e) {
-        BOOST_FAIL(std::string("Unexpected exception caught: ") + e.what());
+        BOOST_CHECK_MESSAGE(false, std::string("Unexpected exception caught: ") + e.what());
     }
 }
 
-template <typename REQUIRE>
-void test_alter(const CommandLine& cl, REQUIRE check) {
+template <typename COMMAND, typename REQUIRE>
+void test_task_command(const CommandLine& cl, REQUIRE check) {
     std::cout << "Testing command line: " << cl.original() << std::endl;
 
     ClientOptions options;
     ClientEnvironment environment(false);
+    // Setup environment with some defaults
+    environment.set_child_path("/path/to/child");
+    environment.set_child_password("password");
     try {
         auto base_command    = options.parse(cl, &environment);
-        auto derived_command = dynamic_cast<AlterCmd*>(base_command.get());
+        auto derived_command = dynamic_cast<COMMAND*>(base_command.get());
 
         BOOST_REQUIRE(derived_command);
         check(*derived_command, environment);
     }
     catch (boost::program_options::unknown_option& e) {
-        BOOST_FAIL(std::string("Unexpected exception caught: ") + e.what());
+        BOOST_CHECK_MESSAGE(false, std::string("Unexpected exception caught: ") + e.what());
     }
 }
 
@@ -65,6 +74,8 @@ BOOST_AUTO_TEST_SUITE(S_Client)
 
 BOOST_AUTO_TEST_SUITE(T_ClientOptions)
 
+BOOST_AUTO_TEST_SUITE(T_Generic) // test generic options
+
 BOOST_AUTO_TEST_CASE(test_is_able_to_process_username_and_password) {
     const char* expected_username = "username";
     const char* plain_password    = "password";
@@ -85,6 +96,72 @@ BOOST_AUTO_TEST_CASE(test_is_able_to_process_username_and_password) {
     BOOST_REQUIRE(expected_password == actual_password);
 }
 
+BOOST_AUTO_TEST_SUITE_END()
+
+BOOST_AUTO_TEST_SUITE(T_Abort) // --abort (AbortCmd)
+
+BOOST_AUTO_TEST_CASE(test_is_able_to_handle_abort) {
+    {
+        auto cl = CommandLine::make_command_line("ecflow_client", "--abort");
+        test_task_command<AbortCmd>(cl, [&](const auto& command, const ClientEnvironment& env) {
+            BOOST_CHECK_EQUAL(command.reason(), "");
+        });
+    }
+    {
+        auto cl = CommandLine::make_command_line("ecflow_client", "--abort=");
+        test_task_command<AbortCmd>(cl, [&](const auto& command, const ClientEnvironment& env) {
+            BOOST_CHECK_EQUAL(command.reason(), "");
+        });
+    }
+    {
+        auto cl = CommandLine::make_command_line("ecflow_client", "--abort=somereason");
+        test_task_command<AbortCmd>(cl, [&](const auto& command, const ClientEnvironment& env) {
+            BOOST_CHECK_EQUAL(command.reason(), "somereason");
+        });
+    }
+    {
+        auto cl = CommandLine::make_command_line("ecflow_client", "--abort", "some reason with spaces");
+        test_task_command<AbortCmd>(cl, [&](const auto& command, const ClientEnvironment& env) {
+            BOOST_CHECK_EQUAL(command.reason(), "some reason with spaces");
+        });
+    }
+    {
+        auto cl = CommandLine::make_command_line("ecflow_client", "--abort=some reason with spaces ");
+        test_task_command<AbortCmd>(cl, [&](const auto& command, const ClientEnvironment& env) {
+            BOOST_CHECK_EQUAL(command.reason(), "some reason with spaces ");
+        });
+    }
+    {
+        auto cl = CommandLine::make_command_line("ecflow_client", "--abort=some", "reason");
+        test_task_command<AbortCmd>(cl, [&](const auto& command, const ClientEnvironment& env) {
+            BOOST_CHECK_EQUAL(command.reason(), "some"); // Important: the reason is only "some"!
+        });
+    }
+    {
+        auto cl = CommandLine::make_command_line("ecflow_client", "--abort=--dashed reason");
+        test_task_command<AbortCmd>(cl, [&](const auto& command, const ClientEnvironment& env) {
+            BOOST_CHECK_EQUAL(command.reason(), "--dashed reason");
+        });
+    }
+    {
+        auto cl = CommandLine::make_command_line("ecflow_client", "--abort", "--dashed reason");
+        test_task_command<AbortCmd>(cl, [&](const auto& command, const ClientEnvironment& env) {
+            BOOST_CHECK_EQUAL(command.reason(), "--dashed reason");
+        });
+    }
+    {
+        auto cl = CommandLine::make_command_line("ecflow_client", "--abort", "--dashed reason", "--debug");
+        test_task_command<AbortCmd>(cl, [&](const auto& command, const ClientEnvironment& env) {
+            BOOST_CHECK_EQUAL(command.reason(), "--dashed reason");
+            BOOST_CHECK(env.debug());
+        });
+    }
+}
+
+BOOST_AUTO_TEST_SUITE_END()
+
+BOOST_AUTO_TEST_SUITE(T_Alter) // --alter (AlterCmd)
+
 BOOST_AUTO_TEST_CASE(test_is_able_handle_alter_change) {
 
     /*
@@ -114,7 +191,7 @@ BOOST_AUTO_TEST_CASE(test_is_able_handle_alter_change) {
             {
                 auto cl = CommandLine::make_command_line(
                     "ecflow_client", "--alter", "change", "variable", "name", value, paths);
-                test_alter(cl, [&](const AlterCmd& command, const ClientEnvironment& env) {
+                test_user_command<AlterCmd>(cl, [&](const AlterCmd& command, const ClientEnvironment& env) {
                     BOOST_REQUIRE_EQUAL(command.name(), "name");
                     BOOST_REQUIRE_EQUAL(command.value(), value);
                     BOOST_REQUIRE_EQUAL(command.change_attr_type(), Expected::VARIABLE);
@@ -130,7 +207,7 @@ BOOST_AUTO_TEST_CASE(test_is_able_handle_alter_change) {
             {
                 auto cl = CommandLine::make_command_line(
                     "ecflow_client", "--alter", "change", "variable", "name", value, paths, "--debug");
-                test_alter(cl, [&](const AlterCmd& command, const ClientEnvironment& env) {
+                test_user_command<AlterCmd>(cl, [&](const AlterCmd& command, const ClientEnvironment& env) {
                     BOOST_REQUIRE_EQUAL(command.name(), "name");
                     BOOST_REQUIRE_EQUAL(command.value(), value);
                     BOOST_REQUIRE_EQUAL(command.change_attr_type(), Expected::VARIABLE);
@@ -160,7 +237,7 @@ BOOST_AUTO_TEST_CASE(test_is_able_handle_alter_change) {
             {
                 auto cl =
                     CommandLine::make_command_line("ecflow_client", "--alter", "change", "label", "name", value, paths);
-                test_alter(cl, [&](const AlterCmd& command, const ClientEnvironment& env) {
+                test_user_command<AlterCmd>(cl, [&](const AlterCmd& command, const ClientEnvironment& env) {
                     BOOST_REQUIRE_EQUAL(command.name(), "name");
                     BOOST_REQUIRE_EQUAL(command.value(), value);
                     BOOST_REQUIRE_EQUAL(command.change_attr_type(), Expected::LABEL);
@@ -176,7 +253,7 @@ BOOST_AUTO_TEST_CASE(test_is_able_handle_alter_change) {
             {
                 auto cl = CommandLine::make_command_line(
                     "ecflow_client", "--alter", "change", "label", "name", value, paths, "--debug");
-                test_alter(cl, [&](const AlterCmd& command, const ClientEnvironment& env) {
+                test_user_command<AlterCmd>(cl, [&](const AlterCmd& command, const ClientEnvironment& env) {
                     BOOST_REQUIRE_EQUAL(command.name(), "name");
                     BOOST_REQUIRE_EQUAL(command.value(), value);
                     BOOST_REQUIRE_EQUAL(command.change_attr_type(), Expected::LABEL);
@@ -197,7 +274,7 @@ BOOST_AUTO_TEST_CASE(test_is_able_handle_alter_change) {
         // No value provided
         {
             auto cl = CommandLine::make_command_line("ecflow_client", "--alter", "change", "event", "name", paths);
-            test_alter(cl, [&](const AlterCmd& command, const ClientEnvironment& env) {
+            test_user_command<AlterCmd>(cl, [&](const AlterCmd& command, const ClientEnvironment& env) {
                 BOOST_REQUIRE_EQUAL(command.name(), "name");
                 BOOST_REQUIRE_EQUAL(command.value(), "");
                 BOOST_REQUIRE_EQUAL(command.change_attr_type(), Expected::EVENT);
@@ -213,7 +290,7 @@ BOOST_AUTO_TEST_CASE(test_is_able_handle_alter_change) {
         {
             auto cl =
                 CommandLine::make_command_line("ecflow_client", "--alter", "change", "event", "name", paths, "--debug");
-            test_alter(cl, [&](const AlterCmd& command, const ClientEnvironment& env) {
+            test_user_command<AlterCmd>(cl, [&](const AlterCmd& command, const ClientEnvironment& env) {
                 BOOST_REQUIRE_EQUAL(command.name(), "name");
                 BOOST_REQUIRE_EQUAL(command.value(), "");
                 BOOST_REQUIRE_EQUAL(command.change_attr_type(), Expected::EVENT);
@@ -232,7 +309,7 @@ BOOST_AUTO_TEST_CASE(test_is_able_handle_alter_change) {
             {
                 auto cl =
                     CommandLine::make_command_line("ecflow_client", "--alter", "change", "event", "name", value, paths);
-                test_alter(cl, [&](const AlterCmd& command, const ClientEnvironment& env) {
+                test_user_command<AlterCmd>(cl, [&](const AlterCmd& command, const ClientEnvironment& env) {
                     BOOST_REQUIRE_EQUAL(command.name(), "name");
                     BOOST_REQUIRE_EQUAL(command.value(), value);
                     BOOST_REQUIRE_EQUAL(command.change_attr_type(), Expected::EVENT);
@@ -248,7 +325,7 @@ BOOST_AUTO_TEST_CASE(test_is_able_handle_alter_change) {
             {
                 auto cl = CommandLine::make_command_line(
                     "ecflow_client", "--alter", "change", "event", "name", value, paths, "--debug");
-                test_alter(cl, [&](const AlterCmd& command, const ClientEnvironment& env) {
+                test_user_command<AlterCmd>(cl, [&](const AlterCmd& command, const ClientEnvironment& env) {
                     BOOST_REQUIRE_EQUAL(command.name(), "name");
                     BOOST_REQUIRE_EQUAL(command.value(), value);
                     BOOST_REQUIRE_EQUAL(command.change_attr_type(), Expected::EVENT);
@@ -271,7 +348,7 @@ BOOST_AUTO_TEST_CASE(test_is_able_handle_alter_change) {
             {
                 auto cl =
                     CommandLine::make_command_line("ecflow_client", "--alter", "change", "meter", "name", value, paths);
-                test_alter(cl, [&](const AlterCmd& command, const ClientEnvironment& env) {
+                test_user_command<AlterCmd>(cl, [&](const AlterCmd& command, const ClientEnvironment& env) {
                     BOOST_REQUIRE_EQUAL(command.name(), "name");
                     BOOST_REQUIRE_EQUAL(command.value(), value);
                     BOOST_REQUIRE_EQUAL(command.change_attr_type(), Expected::METER);
@@ -287,7 +364,7 @@ BOOST_AUTO_TEST_CASE(test_is_able_handle_alter_change) {
             {
                 auto cl = CommandLine::make_command_line(
                     "ecflow_client", "--alter", "change", "meter", "name", value, paths, "--debug");
-                test_alter(cl, [&](const AlterCmd& command, const ClientEnvironment& env) {
+                test_user_command<AlterCmd>(cl, [&](const AlterCmd& command, const ClientEnvironment& env) {
                     BOOST_REQUIRE_EQUAL(command.name(), "name");
                     BOOST_REQUIRE_EQUAL(command.value(), value);
                     BOOST_REQUIRE_EQUAL(command.change_attr_type(), Expected::METER);
@@ -310,7 +387,7 @@ BOOST_AUTO_TEST_CASE(test_is_able_handle_alter_change) {
             {
                 auto cl =
                     CommandLine::make_command_line("ecflow_client", "--alter", "change", "clock_type", value, paths);
-                test_alter(cl, [&](const AlterCmd& command, const ClientEnvironment& env) {
+                test_user_command<AlterCmd>(cl, [&](const AlterCmd& command, const ClientEnvironment& env) {
                     BOOST_REQUIRE_EQUAL(command.name(), value);
                     BOOST_REQUIRE_EQUAL(command.value(), "");
                     BOOST_REQUIRE_EQUAL(command.change_attr_type(), Expected::CLOCK_TYPE);
@@ -326,7 +403,7 @@ BOOST_AUTO_TEST_CASE(test_is_able_handle_alter_change) {
             {
                 auto cl = CommandLine::make_command_line(
                     "ecflow_client", "--alter", "change", "clock_type", value, paths, "--port", "1234");
-                test_alter(cl, [&](const AlterCmd& command, const ClientEnvironment& env) {
+                test_user_command<AlterCmd>(cl, [&](const AlterCmd& command, const ClientEnvironment& env) {
                     BOOST_REQUIRE_EQUAL(command.name(), value);
                     BOOST_REQUIRE_EQUAL(command.value(), "");
                     BOOST_REQUIRE_EQUAL(command.change_attr_type(), Expected::CLOCK_TYPE);
@@ -347,7 +424,7 @@ BOOST_AUTO_TEST_CASE(test_is_able_handle_alter_change) {
         {
             auto cl =
                 CommandLine::make_command_line("ecflow_client", "--alter", "change", "clock_gain", "2023.01.01", paths);
-            test_alter(cl, [&](const AlterCmd& command, const ClientEnvironment& env) {
+            test_user_command<AlterCmd>(cl, [&](const AlterCmd& command, const ClientEnvironment& env) {
                 BOOST_REQUIRE_EQUAL(command.name(), "2023.01.01");
                 BOOST_REQUIRE_EQUAL(command.value(), "");
                 BOOST_REQUIRE_EQUAL(command.change_attr_type(), Expected::CLOCK_GAIN);
@@ -363,7 +440,7 @@ BOOST_AUTO_TEST_CASE(test_is_able_handle_alter_change) {
         {
             auto cl = CommandLine::make_command_line(
                 "ecflow_client", "--alter", "change", "clock_gain", "2023.01.01", paths, "--debug");
-            test_alter(cl, [&](const AlterCmd& command, const ClientEnvironment& env) {
+            test_user_command<AlterCmd>(cl, [&](const AlterCmd& command, const ClientEnvironment& env) {
                 BOOST_REQUIRE_EQUAL(command.name(), "2023.01.01");
                 BOOST_REQUIRE_EQUAL(command.value(), "");
                 BOOST_REQUIRE_EQUAL(command.change_attr_type(), Expected::CLOCK_GAIN);
@@ -382,7 +459,7 @@ BOOST_AUTO_TEST_CASE(test_is_able_handle_alter_change) {
          * ---------------------------------------------------------------------------------------------------------- */
         {
             auto cl = CommandLine::make_command_line("ecflow_client", "--alter", "change", "clock_sync", paths);
-            test_alter(cl, [&](const AlterCmd& command, const ClientEnvironment& env) {
+            test_user_command<AlterCmd>(cl, [&](const AlterCmd& command, const ClientEnvironment& env) {
                 BOOST_REQUIRE_EQUAL(command.name(), "");
                 BOOST_REQUIRE_EQUAL(command.value(), "");
                 BOOST_REQUIRE_EQUAL(command.change_attr_type(), Expected::CLOCK_SYNC);
@@ -398,7 +475,7 @@ BOOST_AUTO_TEST_CASE(test_is_able_handle_alter_change) {
         {
             auto cl =
                 CommandLine::make_command_line("ecflow_client", "--alter", "change", "clock_sync", paths, "--debug");
-            test_alter(cl, [&](const AlterCmd& command, const ClientEnvironment& env) {
+            test_user_command<AlterCmd>(cl, [&](const AlterCmd& command, const ClientEnvironment& env) {
                 BOOST_REQUIRE_EQUAL(command.name(), "");
                 BOOST_REQUIRE_EQUAL(command.value(), "");
                 BOOST_REQUIRE_EQUAL(command.change_attr_type(), Expected::CLOCK_SYNC);
@@ -419,7 +496,7 @@ BOOST_AUTO_TEST_CASE(test_is_able_handle_alter_change) {
         for (const auto& value : late_values) {
             {
                 auto cl = CommandLine::make_command_line("ecflow_client", "--alter", "change", "late", value, paths);
-                test_alter(cl, [&](const AlterCmd& command, const ClientEnvironment& env) {
+                test_user_command<AlterCmd>(cl, [&](const AlterCmd& command, const ClientEnvironment& env) {
                     BOOST_REQUIRE_EQUAL(command.name(), value);
                     BOOST_REQUIRE_EQUAL(command.value(), "");
                     BOOST_REQUIRE_EQUAL(command.change_attr_type(), Expected::LATE);
@@ -435,7 +512,7 @@ BOOST_AUTO_TEST_CASE(test_is_able_handle_alter_change) {
             {
                 auto cl = CommandLine::make_command_line(
                     "ecflow_client", "--alter", "change", "late", value, paths, "--debug");
-                test_alter(cl, [&](const AlterCmd& command, const ClientEnvironment& env) {
+                test_user_command<AlterCmd>(cl, [&](const AlterCmd& command, const ClientEnvironment& env) {
                     BOOST_REQUIRE_EQUAL(command.name(), value);
                     BOOST_REQUIRE_EQUAL(command.value(), "");
                     BOOST_REQUIRE_EQUAL(command.change_attr_type(), Expected::LATE);
@@ -481,7 +558,7 @@ BOOST_AUTO_TEST_CASE(test_is_able_handle_alter_add) {
             {
                 auto cl =
                     CommandLine::make_command_line("ecflow_client", "--alter", "add", "variable", "name", value, paths);
-                test_alter(cl, [&](const AlterCmd& command, const ClientEnvironment& env) {
+                test_user_command<AlterCmd>(cl, [&](const AlterCmd& command, const ClientEnvironment& env) {
                     BOOST_REQUIRE_EQUAL(command.name(), "name");
                     BOOST_REQUIRE_EQUAL(command.value(), value);
                     BOOST_REQUIRE_EQUAL(command.add_attr_type(), Expected::ADD_VARIABLE);
@@ -497,7 +574,7 @@ BOOST_AUTO_TEST_CASE(test_is_able_handle_alter_add) {
             {
                 auto cl = CommandLine::make_command_line(
                     "ecflow_client", "--alter", "add", "variable", "name", value, paths, "--debug");
-                test_alter(cl, [&](const AlterCmd& command, const ClientEnvironment& env) {
+                test_user_command<AlterCmd>(cl, [&](const AlterCmd& command, const ClientEnvironment& env) {
                     BOOST_REQUIRE_EQUAL(command.name(), "name");
                     BOOST_REQUIRE_EQUAL(command.value(), value);
                     BOOST_REQUIRE_EQUAL(command.add_attr_type(), Expected::ADD_VARIABLE);
@@ -533,7 +610,7 @@ BOOST_AUTO_TEST_CASE(test_is_able_handle_alter_delete) {
         {
             auto cl =
                 CommandLine::make_command_line("ecflow_client", "--alter", "delete", "variable", paths, "--debug");
-            test_alter(cl, [&](const AlterCmd& command, const ClientEnvironment& env) {
+            test_user_command<AlterCmd>(cl, [&](const AlterCmd& command, const ClientEnvironment& env) {
                 BOOST_REQUIRE_EQUAL(command.name(), "");
                 BOOST_REQUIRE_EQUAL(command.value(), "");
                 BOOST_REQUIRE_EQUAL(command.delete_attr_type(), Expected::DEL_VARIABLE);
@@ -548,7 +625,7 @@ BOOST_AUTO_TEST_CASE(test_is_able_handle_alter_delete) {
         }
         {
             auto cl = CommandLine::make_command_line("ecflow_client", "--alter", "delete", "variable", "name", paths);
-            test_alter(cl, [&](const AlterCmd& command, const ClientEnvironment& env) {
+            test_user_command<AlterCmd>(cl, [&](const AlterCmd& command, const ClientEnvironment& env) {
                 BOOST_REQUIRE_EQUAL(command.name(), "name");
                 BOOST_REQUIRE_EQUAL(command.value(), "");
                 BOOST_REQUIRE_EQUAL(command.delete_attr_type(), Expected::DEL_VARIABLE);
@@ -564,7 +641,7 @@ BOOST_AUTO_TEST_CASE(test_is_able_handle_alter_delete) {
         {
             auto cl = CommandLine::make_command_line(
                 "ecflow_client", "--alter", "delete", "variable", "name", paths, "--debug");
-            test_alter(cl, [&](const AlterCmd& command, const ClientEnvironment& env) {
+            test_user_command<AlterCmd>(cl, [&](const AlterCmd& command, const ClientEnvironment& env) {
                 BOOST_REQUIRE_EQUAL(command.name(), "name");
                 BOOST_REQUIRE_EQUAL(command.value(), "");
                 BOOST_REQUIRE_EQUAL(command.delete_attr_type(), Expected::DEL_VARIABLE);
@@ -584,7 +661,7 @@ BOOST_AUTO_TEST_CASE(test_is_able_handle_alter_delete) {
         // No explicit name, means delete all labels
         {
             auto cl = CommandLine::make_command_line("ecflow_client", "--alter", "delete", "label", paths);
-            test_alter(cl, [&](const AlterCmd& command, const ClientEnvironment& env) {
+            test_user_command<AlterCmd>(cl, [&](const AlterCmd& command, const ClientEnvironment& env) {
                 BOOST_REQUIRE_EQUAL(command.name(), "");
                 BOOST_REQUIRE_EQUAL(command.value(), "");
                 BOOST_REQUIRE_EQUAL(command.delete_attr_type(), Expected::DEL_LABEL);
@@ -599,7 +676,7 @@ BOOST_AUTO_TEST_CASE(test_is_able_handle_alter_delete) {
         }
         {
             auto cl = CommandLine::make_command_line("ecflow_client", "--alter", "delete", "label", "name", paths);
-            test_alter(cl, [&](const AlterCmd& command, const ClientEnvironment& env) {
+            test_user_command<AlterCmd>(cl, [&](const AlterCmd& command, const ClientEnvironment& env) {
                 BOOST_REQUIRE_EQUAL(command.name(), "name");
                 BOOST_REQUIRE_EQUAL(command.value(), "");
                 BOOST_REQUIRE_EQUAL(command.delete_attr_type(), Expected::DEL_LABEL);
@@ -615,7 +692,7 @@ BOOST_AUTO_TEST_CASE(test_is_able_handle_alter_delete) {
         {
             auto cl =
                 CommandLine::make_command_line("ecflow_client", "--alter", "delete", "label", "name", paths, "--debug");
-            test_alter(cl, [&](const AlterCmd& command, const ClientEnvironment& env) {
+            test_user_command<AlterCmd>(cl, [&](const AlterCmd& command, const ClientEnvironment& env) {
                 BOOST_REQUIRE_EQUAL(command.name(), "name");
                 BOOST_REQUIRE_EQUAL(command.value(), "");
                 BOOST_REQUIRE_EQUAL(command.delete_attr_type(), Expected::DEL_LABEL);
@@ -635,7 +712,7 @@ BOOST_AUTO_TEST_CASE(test_is_able_handle_alter_delete) {
         // No explicit name, means delete all events
         {
             auto cl = CommandLine::make_command_line("ecflow_client", "--alter", "delete", "event", paths);
-            test_alter(cl, [&](const AlterCmd& command, const ClientEnvironment& env) {
+            test_user_command<AlterCmd>(cl, [&](const AlterCmd& command, const ClientEnvironment& env) {
                 BOOST_REQUIRE_EQUAL(command.name(), "");
                 BOOST_REQUIRE_EQUAL(command.value(), "");
                 BOOST_REQUIRE_EQUAL(command.delete_attr_type(), Expected::DEL_EVENT);
@@ -650,7 +727,7 @@ BOOST_AUTO_TEST_CASE(test_is_able_handle_alter_delete) {
         }
         {
             auto cl = CommandLine::make_command_line("ecflow_client", "--alter", "delete", "event", "name", paths);
-            test_alter(cl, [&](const AlterCmd& command, const ClientEnvironment& env) {
+            test_user_command<AlterCmd>(cl, [&](const AlterCmd& command, const ClientEnvironment& env) {
                 BOOST_REQUIRE_EQUAL(command.name(), "name");
                 BOOST_REQUIRE_EQUAL(command.value(), "");
                 BOOST_REQUIRE_EQUAL(command.delete_attr_type(), Expected::DEL_EVENT);
@@ -666,7 +743,7 @@ BOOST_AUTO_TEST_CASE(test_is_able_handle_alter_delete) {
         {
             auto cl =
                 CommandLine::make_command_line("ecflow_client", "--alter", "delete", "event", "name", paths, "--debug");
-            test_alter(cl, [&](const AlterCmd& command, const ClientEnvironment& env) {
+            test_user_command<AlterCmd>(cl, [&](const AlterCmd& command, const ClientEnvironment& env) {
                 BOOST_REQUIRE_EQUAL(command.name(), "name");
                 BOOST_REQUIRE_EQUAL(command.value(), "");
                 BOOST_REQUIRE_EQUAL(command.delete_attr_type(), Expected::DEL_EVENT);
@@ -690,7 +767,7 @@ BOOST_AUTO_TEST_CASE(test_is_able_handle_alter_delete) {
                                                      "name",
                                                      paths,
                                                      "--debug");
-            test_alter(cl, [&](const AlterCmd& command, const ClientEnvironment& env) {
+            test_user_command<AlterCmd>(cl, [&](const AlterCmd& command, const ClientEnvironment& env) {
                 BOOST_REQUIRE_EQUAL(command.name(), "name");
                 BOOST_REQUIRE_EQUAL(command.value(), "");
                 BOOST_REQUIRE_EQUAL(command.delete_attr_type(), Expected::DEL_EVENT);
@@ -715,7 +792,7 @@ BOOST_AUTO_TEST_CASE(test_is_able_handle_alter_delete) {
                                                      "--debug",
                                                      "--port",
                                                      "8888");
-            test_alter(cl, [&](const AlterCmd& command, const ClientEnvironment& env) {
+            test_user_command<AlterCmd>(cl, [&](const AlterCmd& command, const ClientEnvironment& env) {
                 BOOST_REQUIRE_EQUAL(command.name(), "name");
                 BOOST_REQUIRE_EQUAL(command.value(), "");
                 BOOST_REQUIRE_EQUAL(command.delete_attr_type(), Expected::DEL_EVENT);
@@ -730,7 +807,7 @@ BOOST_AUTO_TEST_CASE(test_is_able_handle_alter_delete) {
         }
         {
             auto cl = CommandLine::make_command_line("ecflow_client", "--alter", "delete", "event", paths, "--debug");
-            test_alter(cl, [&](const AlterCmd& command, const ClientEnvironment& env) {
+            test_user_command<AlterCmd>(cl, [&](const AlterCmd& command, const ClientEnvironment& env) {
                 BOOST_REQUIRE_EQUAL(command.name(), "");
                 BOOST_REQUIRE_EQUAL(command.value(), "");
                 BOOST_REQUIRE_EQUAL(command.delete_attr_type(), Expected::DEL_EVENT);
@@ -746,54 +823,525 @@ BOOST_AUTO_TEST_CASE(test_is_able_handle_alter_delete) {
     } // paths
 }
 
+BOOST_AUTO_TEST_SUITE_END()
+
+BOOST_AUTO_TEST_SUITE(T_Begin) // --begin (BeginCmd)
+
+BOOST_AUTO_TEST_CASE(test_is_able_to_handle_begin) {
+    using Command = BeginCmd;
+    {
+        auto cl = CommandLine::make_command_line("ecflow_client", "--begin");
+        test_task_command<Command>(cl, [&](const BeginCmd& command, const ClientEnvironment& env) {
+            BOOST_CHECK_EQUAL(command.suiteName(), "");
+            BOOST_CHECK_EQUAL(command.force(), false);
+        });
+    }
+    {
+        auto cl = CommandLine::make_command_line("ecflow_client", "--begin=somesuite");
+        test_task_command<Command>(cl, [&](const BeginCmd& command, const ClientEnvironment& env) {
+            BOOST_CHECK_EQUAL(command.suiteName(), "somesuite");
+            BOOST_CHECK_EQUAL(command.force(), false);
+        });
+    }
+    {
+        auto cl = CommandLine::make_command_line("ecflow_client", "--begin=suite --force");
+        test_task_command<Command>(cl, [&](const BeginCmd& command, const ClientEnvironment& env) {
+            BOOST_CHECK_EQUAL(command.suiteName(), "suite");
+            BOOST_CHECK_EQUAL(command.force(), true);
+        });
+    }
+    {
+        auto cl = CommandLine::make_command_line("ecflow_client", R"(--begin="suite --force")");
+        test_task_command<Command>(cl, [&](const BeginCmd& command, const ClientEnvironment& env) {
+            BOOST_CHECK_EQUAL(command.suiteName(), "suite");
+            BOOST_CHECK_EQUAL(command.force(), true);
+        });
+    }
+    {
+        auto cl = CommandLine::make_command_line("ecflow_client", "--begin", "suite --force");
+        test_task_command<Command>(cl, [&](const BeginCmd& command, const ClientEnvironment& env) {
+            BOOST_CHECK_EQUAL(command.suiteName(), "suite");
+            BOOST_CHECK_EQUAL(command.force(), true);
+        });
+    }
+    {
+        auto cl = CommandLine::make_command_line("ecflow_client", R"(--begin="--force")");
+        test_task_command<Command>(cl, [&](const BeginCmd& command, const ClientEnvironment& env) {
+            BOOST_CHECK_EQUAL(command.suiteName(), "");
+            BOOST_CHECK_EQUAL(command.force(), true);
+        });
+    }
+    {
+        auto cl = CommandLine::make_command_line("ecflow_client", "--begin", "--force");
+        // This is an invalid, as --begin only takes a single argument (potentialy with --force as second value)
+    }
+}
+
+BOOST_AUTO_TEST_SUITE_END()
+
+BOOST_AUTO_TEST_SUITE(T_Check) // --check (PathsCmd)
+
+BOOST_AUTO_TEST_CASE(test_is_able_to_handle_check) {
+    using Command = PathsCmd;
+    {
+        auto cl = CommandLine::make_command_line("ecflow_client", "--check=_all_");
+        test_user_command<Command>(cl, [&](const auto& command, const ClientEnvironment& env) {
+            BOOST_CHECK_EQUAL(command.api(), PathsCmd::CHECK);
+            BOOST_CHECK_EQUAL(command.paths().size(), static_cast<size_t>(0));
+            BOOST_CHECK_EQUAL(command.force(), false);
+        });
+    }
+    {
+        auto cl = CommandLine::make_command_line("ecflow_client", "--check", "_all_");
+        test_user_command<Command>(cl, [&](const auto& command, const ClientEnvironment& env) {
+            BOOST_CHECK_EQUAL(command.api(), PathsCmd::CHECK);
+            BOOST_CHECK_EQUAL(command.paths().size(), static_cast<size_t>(0));
+            BOOST_CHECK_EQUAL(command.force(), false);
+        });
+    }
+    {
+        auto cl = CommandLine::make_command_line("ecflow_client", "--check=/");
+        test_user_command<Command>(cl, [&](const auto& command, const ClientEnvironment& env) {
+            BOOST_CHECK_EQUAL(command.api(), PathsCmd::CHECK);
+            BOOST_CHECK_EQUAL(command.paths().size(), static_cast<size_t>(0));
+            BOOST_CHECK_EQUAL(command.force(), false);
+        });
+    }
+    {
+        auto cl = CommandLine::make_command_line("ecflow_client", "--check", "/");
+        test_user_command<Command>(cl, [&](const auto& command, const ClientEnvironment& env) {
+            BOOST_CHECK_EQUAL(command.api(), PathsCmd::CHECK);
+            BOOST_CHECK_EQUAL(command.paths().size(), static_cast<size_t>(0));
+            BOOST_CHECK_EQUAL(command.force(), false);
+        });
+    }
+
+    {
+        auto cl = CommandLine::make_command_line("ecflow_client", "--check=/s1", "/s2/f2", "/s3/f3/t3");
+        test_user_command<Command>(cl, [&](const auto& command, const ClientEnvironment& env) {
+            BOOST_CHECK_EQUAL(command.api(), PathsCmd::CHECK);
+            BOOST_REQUIRE_EQUAL(command.paths().size(), static_cast<size_t>(3));
+            BOOST_CHECK_EQUAL(command.paths()[0], "/s1");
+            BOOST_CHECK_EQUAL(command.paths()[1], "/s2/f2");
+            BOOST_CHECK_EQUAL(command.paths()[2], "/s3/f3/t3");
+            BOOST_CHECK_EQUAL(command.force(), false);
+        });
+    }
+    {
+        auto cl = CommandLine::make_command_line("ecflow_client", "--check", "/s1", "/s2/f2", "/s3/f3/t3");
+        test_user_command<Command>(cl, [&](const auto& command, const ClientEnvironment& env) {
+            BOOST_CHECK_EQUAL(command.api(), PathsCmd::CHECK);
+            BOOST_CHECK_EQUAL(command.paths().size(), static_cast<size_t>(3));
+            BOOST_CHECK_EQUAL(command.paths()[0], "/s1");
+            BOOST_CHECK_EQUAL(command.paths()[1], "/s2/f2");
+            BOOST_CHECK_EQUAL(command.paths()[2], "/s3/f3/t3");
+            BOOST_CHECK_EQUAL(command.force(), false);
+        });
+    }
+}
+
+BOOST_AUTO_TEST_SUITE_END()
+
+BOOST_AUTO_TEST_SUITE(T_Complete) // --complete (CompleteCmd)
+
+BOOST_AUTO_TEST_CASE(test_is_able_to_handle_complete) {
+    using Command = CompleteCmd;
+    {
+        auto cl = CommandLine::make_command_line("ecflow_client", "--complete");
+        test_task_command<Command>(cl, [&](const auto& command, const ClientEnvironment& env) {
+            BOOST_CHECK(command.variables_to_delete().empty());
+        });
+    }
+    {
+        auto cl = CommandLine::make_command_line("ecflow_client", "--complete", "--remove", "var1");
+        test_task_command<Command>(cl, [&](const auto& command, const ClientEnvironment& env) {
+            BOOST_REQUIRE_EQUAL(command.variables_to_delete().size(), static_cast<size_t>(1));
+            BOOST_REQUIRE_EQUAL(command.variables_to_delete()[0], "var1");
+        });
+    }
+    {
+        auto cl = CommandLine::make_command_line("ecflow_client", "--complete", "--remove", "var1", "var2");
+        test_task_command<Command>(cl, [&](const auto& command, const ClientEnvironment& env) {
+            BOOST_REQUIRE_EQUAL(command.variables_to_delete().size(), static_cast<size_t>(2));
+            BOOST_REQUIRE_EQUAL(command.variables_to_delete()[0], "var1");
+            BOOST_REQUIRE_EQUAL(command.variables_to_delete()[1], "var2");
+        });
+    }
+}
+
+BOOST_AUTO_TEST_SUITE_END()
+
+BOOST_AUTO_TEST_SUITE(T_Event) // --event (EventCmd)
+
+BOOST_AUTO_TEST_CASE(test_is_able_to_handle_event) {
+    using Command = EventCmd;
+    {
+        auto cl = CommandLine::make_command_line("ecflow_client", "--event=name");
+        test_task_command<Command>(cl, [&](const auto& command, const ClientEnvironment& env) {
+            BOOST_CHECK_EQUAL(command.name(), "name");
+            BOOST_CHECK_EQUAL(command.value(), true);
+        });
+    }
+    {
+        auto cl = CommandLine::make_command_line("ecflow_client", "--event", "name");
+        test_task_command<Command>(cl, [&](const auto& command, const ClientEnvironment& env) {
+            BOOST_CHECK_EQUAL(command.name(), "name");
+            BOOST_CHECK_EQUAL(command.value(), true);
+        });
+    }
+    {
+        auto cl = CommandLine::make_command_line("ecflow_client", "--event=name", "set");
+        test_task_command<Command>(cl, [&](const auto& command, const ClientEnvironment& env) {
+            BOOST_CHECK_EQUAL(command.name(), "name");
+            BOOST_CHECK_EQUAL(command.value(), true);
+        });
+    }
+    {
+        auto cl = CommandLine::make_command_line("ecflow_client", "--event", "name", "set");
+        test_task_command<Command>(cl, [&](const auto& command, const ClientEnvironment& env) {
+            BOOST_CHECK_EQUAL(command.name(), "name");
+            BOOST_CHECK_EQUAL(command.value(), true);
+        });
+    }
+    {
+        auto cl = CommandLine::make_command_line("ecflow_client", "--event=name", "clear");
+        test_task_command<Command>(cl, [&](const auto& command, const ClientEnvironment& env) {
+            BOOST_CHECK_EQUAL(command.name(), "name");
+            BOOST_CHECK_EQUAL(command.value(), false);
+        });
+    }
+    {
+        auto cl = CommandLine::make_command_line("ecflow_client", "--event", "name", "clear");
+        test_task_command<Command>(cl, [&](const auto& command, const ClientEnvironment& env) {
+            BOOST_CHECK_EQUAL(command.name(), "name");
+            BOOST_CHECK_EQUAL(command.value(), false);
+        });
+    }
+}
+
+BOOST_AUTO_TEST_SUITE_END()
+
+BOOST_AUTO_TEST_SUITE(T_Init) // --init (InitCmd)
+
+BOOST_AUTO_TEST_CASE(test_is_able_to_handle_init) {
+    using Command = InitCmd;
+    {
+        auto cl = CommandLine::make_command_line("ecflow_client", "--init=1234");
+        test_task_command<Command>(cl, [&](const auto& command, const ClientEnvironment& env) {
+            BOOST_CHECK_EQUAL(command.process_or_remote_id(), "1234");
+            BOOST_CHECK_EQUAL(command.variables_to_add().size(), static_cast<size_t>(0));
+        });
+    }
+    {
+        auto cl = CommandLine::make_command_line("ecflow_client", "--init", "1234");
+        test_task_command<Command>(cl, [&](const auto& command, const ClientEnvironment& env) {
+            BOOST_CHECK_EQUAL(command.process_or_remote_id(), "1234");
+            BOOST_CHECK_EQUAL(command.variables_to_add().size(), static_cast<size_t>(0));
+        });
+    }
+    {
+        auto cl = CommandLine::make_command_line("ecflow_client", "--init=1234", "--add", "name1=value1");
+        test_task_command<Command>(cl, [&](const auto& command, const ClientEnvironment& env) {
+            BOOST_CHECK_EQUAL(command.process_or_remote_id(), "1234");
+            BOOST_REQUIRE_EQUAL(command.variables_to_add().size(), static_cast<size_t>(1));
+            BOOST_CHECK_EQUAL(command.variables_to_add()[0].name(), "name1");
+            BOOST_CHECK_EQUAL(command.variables_to_add()[0].theValue(), "value1");
+        });
+    }
+    {
+        auto cl =
+            CommandLine::make_command_line("ecflow_client", "--init=1234", "--add", "name1=--value1", "name2=--value2");
+        test_task_command<Command>(cl, [&](const auto& command, const ClientEnvironment& env) {
+            BOOST_CHECK_EQUAL(command.process_or_remote_id(), "1234");
+            BOOST_REQUIRE_EQUAL(command.variables_to_add().size(), static_cast<size_t>(2));
+            BOOST_CHECK_EQUAL(command.variables_to_add()[0].name(), "name1");
+            BOOST_CHECK_EQUAL(command.variables_to_add()[0].theValue(), "--value1");
+            BOOST_CHECK_EQUAL(command.variables_to_add()[1].name(), "name2");
+            BOOST_CHECK_EQUAL(command.variables_to_add()[1].theValue(), "--value2");
+        });
+    }
+}
+
+BOOST_AUTO_TEST_SUITE_END()
+
+BOOST_AUTO_TEST_SUITE(T_Label) // --label (LabelCmd)
+
 BOOST_AUTO_TEST_CASE(test_is_able_to_handle_label) {
+    using Command = LabelCmd;
+    {
+        auto cl = CommandLine::make_command_line("ecflow_client", "--label=name", "some value with spaces");
+        test_task_command<Command>(cl, [&](const auto& command, const ClientEnvironment& env) {
+            BOOST_CHECK_EQUAL(command.name(), "name");
+            BOOST_CHECK_EQUAL(command.label(), "some value with spaces");
+        });
+    }
+    {
+        auto cl = CommandLine::make_command_line("ecflow_client", "--label", "name", "some value with spaces");
+        test_task_command<Command>(cl, [&](const auto& command, const ClientEnvironment& env) {
+            BOOST_CHECK_EQUAL(command.name(), "name");
+            BOOST_CHECK_EQUAL(command.label(), "some value with spaces");
+        });
+    }
+    {
+        auto cl = CommandLine::make_command_line("ecflow_client", "--label=name", R"(some "quoted" value)");
+        test_task_command<Command>(cl, [&](const auto& command, const ClientEnvironment& env) {
+            BOOST_CHECK_EQUAL(command.name(), "name");
+            BOOST_CHECK_EQUAL(command.label(), R"(some "quoted" value)");
+        });
+    }
+    {
+        auto cl = CommandLine::make_command_line("ecflow_client", "--label", "name", R"(some "quoted" value)");
+        test_task_command<Command>(cl, [&](const auto& command, const ClientEnvironment& env) {
+            BOOST_CHECK_EQUAL(command.name(), "name");
+            BOOST_CHECK_EQUAL(command.label(), R"(some "quoted" value)");
+        });
+    }
+    {
+        auto cl = CommandLine::make_command_line("ecflow_client", "--label=name", "-j64");
+        test_task_command<Command>(cl, [&](const auto& command, const ClientEnvironment& env) {
+            BOOST_CHECK_EQUAL(command.name(), "name");
+            BOOST_CHECK_EQUAL(command.label(), "-j64");
+        });
+    }
+    {
+        auto cl = CommandLine::make_command_line("ecflow_client", "--label=name", "--long-option");
+        test_task_command<Command>(cl, [&](const auto& command, const ClientEnvironment& env) {
+            BOOST_CHECK_EQUAL(command.name(), "name");
+            BOOST_CHECK_EQUAL(command.label(), "--long-option");
+        });
+    }
+    {
+        auto cl = CommandLine::make_command_line("ecflow_client", "--label=name", "--option=value");
+        test_task_command<Command>(cl, [&](const auto& command, const ClientEnvironment& env) {
+            BOOST_CHECK_EQUAL(command.name(), "name");
+            BOOST_CHECK_EQUAL(command.label(), "--option=value");
+        });
+    }
+    {
+        auto cl = CommandLine::make_command_line("ecflow_client", "--label=name", "--debug", "--debug");
+        test_task_command<Command>(cl, [&](const auto& command, const ClientEnvironment& env) {
+            BOOST_CHECK_EQUAL(command.name(), "name");
+            BOOST_CHECK_EQUAL(command.label(), "--debug");
+        });
+    }
+    {
+        auto cl = CommandLine::make_command_line("ecflow_client", "--label=name", "--port", "--debug", "--port", "123");
+        test_task_command<Command>(cl, [&](const auto& command, const ClientEnvironment& env) {
+            BOOST_CHECK_EQUAL(command.name(), "name");
+            BOOST_CHECK_EQUAL(command.label(), "--port");
+        });
+    }
+}
+
+BOOST_AUTO_TEST_SUITE_END()
+
+BOOST_AUTO_TEST_SUITE(T_Meter) // --meter (MeterCmd)
+
+BOOST_AUTO_TEST_CASE(test_is_able_to_handle_meter) {
+    using Command = MeterCmd;
+    {
+        auto cl = CommandLine::make_command_line("ecflow_client", "--meter=name", "0");
+        test_task_command<Command>(cl, [&](const auto& command, const ClientEnvironment& env) {
+            BOOST_CHECK_EQUAL(command.name(), "name");
+            BOOST_CHECK_EQUAL(command.value(), 0);
+        });
+    }
+    {
+        auto cl = CommandLine::make_command_line("ecflow_client", "--meter", "name", "0");
+        test_task_command<Command>(cl, [&](const auto& command, const ClientEnvironment& env) {
+            BOOST_CHECK_EQUAL(command.name(), "name");
+            BOOST_CHECK_EQUAL(command.value(), 0);
+        });
+    }
+    {
+        auto cl = CommandLine::make_command_line("ecflow_client", "--meter=name", "-1");
+        test_task_command<Command>(cl, [&](const auto& command, const ClientEnvironment& env) {
+            BOOST_CHECK_EQUAL(command.name(), "name");
+            BOOST_CHECK_EQUAL(command.value(), -1);
+        });
+    }
     {
-        auto cl = CommandLine::make_command_line("ecflow_client",
-                                                 "--label=name",
-                                                 "some value with spaces");
-        test_label(cl, [&](const LabelCmd& command, const ClientEnvironment& env) {
-            BOOST_REQUIRE_EQUAL(command.name(), "name");
-            BOOST_REQUIRE_EQUAL(command.label(), "some value with spaces");
+        auto cl = CommandLine::make_command_line("ecflow_client", "--meter", "name", "-1");
+        test_task_command<Command>(cl, [&](const auto& command, const ClientEnvironment& env) {
+            BOOST_CHECK_EQUAL(command.name(), "name");
+            BOOST_CHECK_EQUAL(command.value(), -1);
         });
     }
     {
-        auto cl = CommandLine::make_command_line("ecflow_client",
-                                                 "--label=name",
-                                                 R"(some "quoted" value)");
-        test_label(cl, [&](const LabelCmd& command, const ClientEnvironment& env) {
-            BOOST_REQUIRE_EQUAL(command.name(), "name");
-            BOOST_REQUIRE_EQUAL(command.label(), R"(some "quoted" value)");
+        auto cl = CommandLine::make_command_line("ecflow_client", "--meter=name", "10");
+        test_task_command<Command>(cl, [&](const auto& command, const ClientEnvironment& env) {
+            BOOST_CHECK_EQUAL(command.name(), "name");
+            BOOST_CHECK_EQUAL(command.value(), 10);
         });
     }
     {
-        auto cl = CommandLine::make_command_line("ecflow_client",
-                                                 "--label=name",
-                                                 "-j64");
-        test_label(cl, [&](const LabelCmd& command, const ClientEnvironment& env) {
-            BOOST_REQUIRE_EQUAL(command.name(), "name");
-            BOOST_REQUIRE_EQUAL(command.label(), "-j64");
+        auto cl = CommandLine::make_command_line("ecflow_client", "--meter=name", "20", "--debug");
+        test_task_command<Command>(cl, [&](const auto& command, const ClientEnvironment& env) {
+            BOOST_CHECK_EQUAL(command.name(), "name");
+            BOOST_CHECK_EQUAL(command.value(), 20);
         });
     }
     {
-        auto cl = CommandLine::make_command_line("ecflow_client",
-                                                 "--label=name",
-                                                 "--long-option");
-        test_label(cl, [&](const LabelCmd& command, const ClientEnvironment& env) {
-            BOOST_REQUIRE_EQUAL(command.name(), "name");
-            BOOST_REQUIRE_EQUAL(command.label(), "--long-option");
+        auto cl = CommandLine::make_command_line("ecflow_client", "--meter", "name", "-20", "--debug");
+        test_task_command<Command>(cl, [&](const auto& command, const ClientEnvironment& env) {
+            BOOST_CHECK_EQUAL(command.name(), "name");
+            BOOST_CHECK_EQUAL(command.value(), -20);
         });
     }
     {
-        auto cl = CommandLine::make_command_line("ecflow_client",
-                                                 "--label=name",
-                                                 "--option=value");
-        test_label(cl, [&](const LabelCmd& command, const ClientEnvironment& env) {
-            BOOST_REQUIRE_EQUAL(command.name(), "name");
-            BOOST_REQUIRE_EQUAL(command.label(), "--option=value");
+        auto cl = CommandLine::make_command_line("ecflow_client", "--meter=name", "-100", "--debug", "--port", "1234");
+        test_task_command<Command>(cl, [&](const auto& command, const ClientEnvironment& env) {
+            BOOST_CHECK_EQUAL(command.name(), "name");
+            BOOST_CHECK_EQUAL(command.value(), -100);
+        });
+    }
+    {
+        auto cl =
+            CommandLine::make_command_line("ecflow_client", "--meter", "name", "-100", "--debug", "--port", "1234");
+        test_task_command<Command>(cl, [&](const auto& command, const ClientEnvironment& env) {
+            BOOST_CHECK_EQUAL(command.name(), "name");
+            BOOST_CHECK_EQUAL(command.value(), -100);
+        });
+    }
+    {
+        auto cl = CommandLine::make_command_line(
+            "ecflow_client", "--port", "3141", "--host", "ecflow", "--meter", "step", "-1", "--debug");
+        test_task_command<Command>(cl, [&](const auto& command, const ClientEnvironment& env) {
+            BOOST_CHECK_EQUAL(command.name(), "step");
+            BOOST_CHECK_EQUAL(command.value(), -1);
+        });
+    }
+    {
+        auto cl = CommandLine::make_command_line(
+            "ecflow_client", "--port", "3141", "--host", "ecflow", "--meter", "step", "-1", "--debug");
+        test_task_command<Command>(cl, [&](const auto& command, const ClientEnvironment& env) {
+            BOOST_CHECK_EQUAL(command.name(), "step");
+            BOOST_CHECK_EQUAL(command.value(), -1);
         });
     }
 }
 
 BOOST_AUTO_TEST_SUITE_END()
 
+BOOST_AUTO_TEST_SUITE(T_Queue) // --queue (QueueCmd)
+
+BOOST_AUTO_TEST_CASE(test_is_able_to_handle_queue) {
+    using Command = QueueCmd;
+    {
+        auto cl = CommandLine::make_command_line("ecflow_client", "--queue=name", "active");
+        test_task_command<Command>(cl, [&](const auto& command, const ClientEnvironment& env) {
+            BOOST_CHECK_EQUAL(command.name(), "name");
+            BOOST_CHECK_EQUAL(command.action(), "active");
+        });
+    }
+    {
+        auto cl = CommandLine::make_command_line("ecflow_client", "--queue", "name", "active");
+        test_task_command<Command>(cl, [&](const auto& command, const ClientEnvironment& env) {
+            BOOST_CHECK_EQUAL(command.name(), "name");
+            BOOST_CHECK_EQUAL(command.action(), "active");
+        });
+    }
+    {
+        auto cl = CommandLine::make_command_line("ecflow_client", "--queue", "name", "active", "/s/f/t");
+        test_task_command<Command>(cl, [&](const auto& command, const ClientEnvironment& env) {
+            BOOST_CHECK_EQUAL(command.name(), "name");
+            BOOST_CHECK_EQUAL(command.action(), "active");
+            BOOST_CHECK_EQUAL(command.path_to_node_with_queue(), "/s/f/t");
+        });
+    }
+    {
+        auto cl = CommandLine::make_command_line("ecflow_client", "--queue=name", "complete", "42");
+        test_task_command<Command>(cl, [&](const auto& command, const ClientEnvironment& env) {
+            BOOST_CHECK_EQUAL(command.name(), "name");
+            BOOST_CHECK_EQUAL(command.action(), "complete");
+            BOOST_CHECK_EQUAL(command.step(), "42");
+        });
+    }
+    {
+        auto cl = CommandLine::make_command_line("ecflow_client", "--queue", "name", "complete", "42");
+        test_task_command<Command>(cl, [&](const auto& command, const ClientEnvironment& env) {
+            BOOST_CHECK_EQUAL(command.name(), "name");
+            BOOST_CHECK_EQUAL(command.action(), "complete");
+            BOOST_CHECK_EQUAL(command.step(), "42");
+        });
+    }
+    {
+        auto cl = CommandLine::make_command_line("ecflow_client", "--queue=name", "aborted", "42");
+        test_task_command<Command>(cl, [&](const auto& command, const ClientEnvironment& env) {
+            BOOST_CHECK_EQUAL(command.name(), "name");
+            BOOST_CHECK_EQUAL(command.action(), "aborted");
+            BOOST_CHECK_EQUAL(command.step(), "42");
+        });
+    }
+    {
+        auto cl = CommandLine::make_command_line("ecflow_client", "--queue", "name", "aborted", "42");
+        test_task_command<Command>(cl, [&](const auto& command, const ClientEnvironment& env) {
+            BOOST_CHECK_EQUAL(command.name(), "name");
+            BOOST_CHECK_EQUAL(command.action(), "aborted");
+            BOOST_CHECK_EQUAL(command.step(), "42");
+        });
+    }
+    {
+        auto cl = CommandLine::make_command_line("ecflow_client", "--queue=name", "no_of_aborted");
+        test_task_command<Command>(cl, [&](const auto& command, const ClientEnvironment& env) {
+            BOOST_CHECK_EQUAL(command.name(), "name");
+            BOOST_CHECK_EQUAL(command.action(), "no_of_aborted");
+        });
+    }
+    {
+        auto cl = CommandLine::make_command_line("ecflow_client", "--queue", "name", "no_of_aborted");
+        test_task_command<Command>(cl, [&](const auto& command, const ClientEnvironment& env) {
+            BOOST_CHECK_EQUAL(command.name(), "name");
+            BOOST_CHECK_EQUAL(command.action(), "no_of_aborted");
+        });
+    }
+    {
+        auto cl = CommandLine::make_command_line("ecflow_client", "--queue=name", "no_of_aborted", "/s/f/t");
+        test_task_command<Command>(cl, [&](const auto& command, const ClientEnvironment& env) {
+            BOOST_CHECK_EQUAL(command.name(), "name");
+            BOOST_CHECK_EQUAL(command.action(), "no_of_aborted");
+            BOOST_CHECK_EQUAL(command.path_to_node_with_queue(), "/s/f/t");
+        });
+    }
+    {
+        auto cl = CommandLine::make_command_line("ecflow_client", "--queue=name", "reset");
+        test_task_command<Command>(cl, [&](const auto& command, const ClientEnvironment& env) {
+            BOOST_CHECK_EQUAL(command.name(), "name");
+            BOOST_CHECK_EQUAL(command.action(), "reset");
+        });
+    }
+    {
+        auto cl = CommandLine::make_command_line("ecflow_client", "--queue=name", "reset", "/s/f/t");
+        test_task_command<Command>(cl, [&](const auto& command, const ClientEnvironment& env) {
+            BOOST_CHECK_EQUAL(command.name(), "name");
+            BOOST_CHECK_EQUAL(command.action(), "reset");
+            BOOST_CHECK_EQUAL(command.path_to_node_with_queue(), "/s/f/t");
+        });
+    }
+}
+
+BOOST_AUTO_TEST_SUITE_END()
+
+BOOST_AUTO_TEST_SUITE(T_Wait) // --wait (WaitCmd)
+
+BOOST_AUTO_TEST_CASE(test_is_able_to_handle_wait) {
+    using Command = CtsWaitCmd;
+    {
+        auto cl = CommandLine::make_command_line("ecflow_client", "--wait=/suite/taskx == complete");
+        test_task_command<Command>(cl, [&](const auto& command, const ClientEnvironment& env) {
+            BOOST_CHECK_EQUAL(command.expression(), "/suite/taskx == complete");
+        });
+    }
+    {
+        auto cl = CommandLine::make_command_line("ecflow_client", "--wait", "/suite/taskx == complete");
+        test_task_command<Command>(cl, [&](const auto& command, const ClientEnvironment& env) {
+            BOOST_CHECK_EQUAL(command.expression(), "/suite/taskx == complete");
+        });
+    }
+}
+
+BOOST_AUTO_TEST_SUITE_END()
+
+BOOST_AUTO_TEST_SUITE_END()
+
 BOOST_AUTO_TEST_SUITE_END()
diff --git a/Pyext/ecflow/__init__.py b/Pyext/ecflow/__init__.py
index 45b280deb..3dc8188de 100644
--- a/Pyext/ecflow/__init__.py
+++ b/Pyext/ecflow/__init__.py
@@ -15,6 +15,6 @@
 The ecFlow python module
 """
 
-__version__ = '5.12.2'
+__version__ = '5.12.3'
 
 # http://stackoverflow.com/questions/13040646/how-do-i-create-documentation-with-pydoc
diff --git a/docs/client_api/api/queue.rst b/docs/client_api/api/queue.rst
index c861f9daa..c39cf9e32 100644
--- a/docs/client_api/api/queue.rst
+++ b/docs/client_api/api/queue.rst
@@ -17,7 +17,7 @@ queue
         active: returns the first queued/aborted step, the return string is the queue value from the definition
         no_of_aborted: returns number of aborted steps as a string, i.e 10
         reset: sets the index to the first queued/aborted step. Allows steps to be reprocessed for errors
-     arg2(string) = step: value returned from step=$(ecflow_client --queue=queue_name active)
+     arg3(string) = step: value returned from step=$(ecflow_client --queue=queue_name active)
                    This is only valid for complete and aborted steps
      arg4(string) = path: (optional). The path where the queue is defined.
                     By default we search for the queue up the node tree.
diff --git a/docs/conf.py b/docs/conf.py
index f7f9a4175..f72047e87 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -93,7 +93,7 @@
 
 
 def get_ecflow_version():
-    version = "5.12.2"
+    version = "5.12.3"
     ecflow_version = version.split(".")
     print("Extracted ecflow version '" + str(ecflow_version))
     return ecflow_version
diff --git a/docs/release_notes/version_5.12.rst b/docs/release_notes/version_5.12.rst
index 8b2d961ed..1224c2210 100644
--- a/docs/release_notes/version_5.12.rst
+++ b/docs/release_notes/version_5.12.rst
@@ -6,6 +6,18 @@ Version 5.12 updates
 .. role:: jiraissue
    :class: hidden
 
+
+Version 5.12.3
+==============
+
+* `Released <https://confluence.ecmwf.int/display/ECFLOW/Releases>`__\  on 2024-03-14
+
+ecFlow Client
+-------------
+
+- **Bug** corrected handling of :code:`--meter` when value starts with :code:`-` (e.g. :code:`-1`) :jiraissue:`ECFLOW-1948`
+
+
 Version 5.12.2
 ==============