diff --git a/backends/p4tools/modules/testgen/lib/concolic.h b/backends/p4tools/modules/testgen/lib/concolic.h
index 9096163d66..a2189aaae1 100644
--- a/backends/p4tools/modules/testgen/lib/concolic.h
+++ b/backends/p4tools/modules/testgen/lib/concolic.h
@@ -27,7 +27,8 @@ namespace P4Tools::P4Testgen {
 /// are present, but not expressions. The reason expressions need to be keys is that sometimes
 /// entire expressions are mapped to a particular constant.
 using ConcolicVariableMap =
-    std::map<std::variant<const IR::StateVariable, const IR::Expression *>, const IR::Expression *>;
+    ordered_map<std::variant<const IR::StateVariable, const IR::Expression *>,
+                const IR::Expression *>;
 
 /// Encapsulates a set of concolic method implementations.
 class ConcolicMethodImpls {
diff --git a/backends/p4tools/modules/testgen/lib/test_backend.cpp b/backends/p4tools/modules/testgen/lib/test_backend.cpp
index cb8000892b..1870bd74e8 100644
--- a/backends/p4tools/modules/testgen/lib/test_backend.cpp
+++ b/backends/p4tools/modules/testgen/lib/test_backend.cpp
@@ -63,7 +63,6 @@ const Model *TestBackEnd::computeConcolicVariables(const ExecutionState *executi
             const auto *concolicAssignment = resolvedConcolicVariable.second;
             const IR::Expression *pathConstraint = nullptr;
             // We need to differentiate between state variables and expressions here.
-            // We need to differentiate between state variables and expressions here.
             if (std::holds_alternative<const IR::StateVariable>(concolicVariable)) {
                 pathConstraint = new IR::Equ(std::get<const IR::StateVariable>(concolicVariable),
                                              concolicAssignment);
diff --git a/backends/p4tools/modules/testgen/test/z3-solver/expressions.cpp b/backends/p4tools/modules/testgen/test/z3-solver/expressions.cpp
index 9d8e69d701..73699f5902 100644
--- a/backends/p4tools/modules/testgen/test/z3-solver/expressions.cpp
+++ b/backends/p4tools/modules/testgen/test/z3-solver/expressions.cpp
@@ -123,9 +123,9 @@ void test(const IR::Expression *expression, const IR::AssignmentStatement *varia
 
     // getting model
     Model model = *solver.getModel();
-    ASSERT_EQ(model.size(), 2u);
+    ASSERT_EQ(model.size(), 2U);
 
-    ASSERT_EQ(model.count(variableValue->left->checkedTo<IR::Member>()), 1u);
+    ASSERT_EQ(model.count(variableValue->left->checkedTo<IR::Member>()), 1U);
 
     const auto *value = model.at(variableValue->left->checkedTo<IR::Member>());