17 files changed, 34 insertions, 34 deletions

diff --git a/test/unit/CMakeLists.txt b/test/unit/CMakeLists.txt
index 350127a14..71568e337 100644
--- a/test/unit/CMakeLists.txt
+++ b/test/unit/CMakeLists.txt
@@ -84,7 +84,7 @@ endmacro()
 add_subdirectory(api)
 add_subdirectory(base)
 add_subdirectory(context)
-add_subdirectory(expr)
+add_subdirectory(node)
 add_subdirectory(main)
 add_subdirectory(parser)
 add_subdirectory(printer)
diff --git a/test/unit/expr/CMakeLists.txt b/test/unit/node/CMakeLists.txt
index 52e591aeb..52e591aeb 100644
--- a/test/unit/expr/CMakeLists.txt
+++ b/test/unit/node/CMakeLists.txt
diff --git a/test/unit/expr/attribute_black.cpp b/test/unit/node/attribute_black.cpp
index 64605bdb9..487798e49 100644
--- a/test/unit/expr/attribute_black.cpp
+++ b/test/unit/node/attribute_black.cpp
@@ -30,7 +30,7 @@ using namespace smt;
 
 namespace test {
 
-class TestExprBlackAttribute : public TestNode
+class TestNodeBlackAttribute : public TestNode
 {
  protected:
   struct PrimitiveIntAttributeId
@@ -52,7 +52,7 @@ class TestExprBlackAttribute : public TestNode
   using BoolAttribute = expr::Attribute<BoolAttributeId, bool>;
 };
 
-TEST_F(TestExprBlackAttribute, ints)
+TEST_F(TestNodeBlackAttribute, ints)
 {
   TypeNode booleanType = d_nodeManager->booleanType();
   Node* node = new Node(d_nodeManager->mkSkolem("b", booleanType));
@@ -69,7 +69,7 @@ TEST_F(TestExprBlackAttribute, ints)
   delete node;
 }
 
-TEST_F(TestExprBlackAttribute, tnodes)
+TEST_F(TestNodeBlackAttribute, tnodes)
 {
   TypeNode booleanType = d_nodeManager->booleanType();
   Node* node = new Node(d_nodeManager->mkSkolem("b", booleanType));
@@ -87,7 +87,7 @@ TEST_F(TestExprBlackAttribute, tnodes)
   delete node;
 }
 
-TEST_F(TestExprBlackAttribute, strings)
+TEST_F(TestNodeBlackAttribute, strings)
 {
   TypeNode booleanType = d_nodeManager->booleanType();
   Node* node = new Node(d_nodeManager->mkSkolem("b", booleanType));
@@ -105,7 +105,7 @@ TEST_F(TestExprBlackAttribute, strings)
   delete node;
 }
 
-TEST_F(TestExprBlackAttribute, bools)
+TEST_F(TestNodeBlackAttribute, bools)
 {
   TypeNode booleanType = d_nodeManager->booleanType();
   Node* node = new Node(d_nodeManager->mkSkolem("b", booleanType));
diff --git a/test/unit/expr/attribute_white.cpp b/test/unit/node/attribute_white.cpp
index e9a12261b..fccb587db 100644
--- a/test/unit/expr/attribute_white.cpp
+++ b/test/unit/node/attribute_white.cpp
@@ -54,7 +54,7 @@ using TestFlag3 = Attribute<Test3, bool>;
 using TestFlag4 = Attribute<Test4, bool>;
 using TestFlag5 = Attribute<Test5, bool>;
 
-class TestExprWhiteAttribute : public TestNode
+class TestNodeWhiteAttribute : public TestNode
 {
  protected:
   void SetUp() override
@@ -65,7 +65,7 @@ class TestExprWhiteAttribute : public TestNode
   std::unique_ptr<TypeNode> d_booleanType;
 };
 
-TEST_F(TestExprWhiteAttribute, attribute_ids)
+TEST_F(TestNodeWhiteAttribute, attribute_ids)
 {
   // Test that IDs for (a subset of) attributes in the system are
   // unique and that the LastAttributeId (which would be the next ID
@@ -109,7 +109,7 @@ TEST_F(TestExprWhiteAttribute, attribute_ids)
   ASSERT_LT(TypeAttr::s_id, lastId);
 }
 
-TEST_F(TestExprWhiteAttribute, attributes)
+TEST_F(TestNodeWhiteAttribute, attributes)
 {
   Node a = d_nodeManager->mkVar(*d_booleanType);
   Node b = d_nodeManager->mkVar(*d_booleanType);
diff --git a/test/unit/expr/kind_black.cpp b/test/unit/node/kind_black.cpp
index b8e764726..a33955152 100644
--- a/test/unit/expr/kind_black.cpp
+++ b/test/unit/node/kind_black.cpp
@@ -27,7 +27,7 @@ using namespace kind;
 
 namespace test {
 
-class TestExprBlackKind : public TestInternal
+class TestNodeBlackKind : public TestInternal
 {
  protected:
   void SetUp() override
@@ -55,13 +55,13 @@ class TestExprBlackKind : public TestInternal
   int32_t d_beyond;
 };
 
-TEST_F(TestExprBlackKind, equality)
+TEST_F(TestNodeBlackKind, equality)
 {
   ASSERT_EQ(d_undefined, UNDEFINED_KIND);
   ASSERT_EQ(d_last, LAST_KIND);
 }
 
-TEST_F(TestExprBlackKind, order)
+TEST_F(TestNodeBlackKind, order)
 {
   ASSERT_LT((int32_t)d_undefined, (int32_t)d_null);
   ASSERT_LT((int32_t)d_null, (int32_t)d_last);
@@ -69,14 +69,14 @@ TEST_F(TestExprBlackKind, order)
   ASSERT_LT((int32_t)d_last, (int32_t)d_unknown);
 }
 
-TEST_F(TestExprBlackKind, output)
+TEST_F(TestNodeBlackKind, output)
 {
   ASSERT_TRUE(string_is_as_expected(d_undefined, "UNDEFINED_KIND"));
   ASSERT_TRUE(string_is_as_expected(d_null, "NULL"));
   ASSERT_TRUE(string_is_as_expected(d_last, "LAST_KIND"));
 }
 
-TEST_F(TestExprBlackKind, output_concat)
+TEST_F(TestNodeBlackKind, output_concat)
 {
   std::stringstream act, exp;
   act << d_undefined << d_null << d_last << d_unknown;
diff --git a/test/unit/expr/kind_map_black.cpp b/test/unit/node/kind_map_black.cpp
index ac40d8ed6..8e1c45d79 100644
--- a/test/unit/expr/kind_map_black.cpp
+++ b/test/unit/node/kind_map_black.cpp
@@ -27,11 +27,11 @@ using namespace kind;
 
 namespace test {
 
-class TestExprBlackKindMap : public TestInternal
+class TestNodeBlackKindMap : public TestInternal
 {
 };
 
-TEST_F(TestExprBlackKindMap, simple)
+TEST_F(TestNodeBlackKindMap, simple)
 {
   KindMap map;
   ASSERT_FALSE(map.test(AND));
diff --git a/test/unit/expr/node_algorithm_black.cpp b/test/unit/node/node_algorithm_black.cpp
index bd243e0fd..bd243e0fd 100644
--- a/test/unit/expr/node_algorithm_black.cpp
+++ b/test/unit/node/node_algorithm_black.cpp
diff --git a/test/unit/expr/node_black.cpp b/test/unit/node/node_black.cpp
index 3c1651155..3c1651155 100644
--- a/test/unit/expr/node_black.cpp
+++ b/test/unit/node/node_black.cpp
diff --git a/test/unit/expr/node_builder_black.cpp b/test/unit/node/node_builder_black.cpp
index 7e38dd899..7e38dd899 100644
--- a/test/unit/expr/node_builder_black.cpp
+++ b/test/unit/node/node_builder_black.cpp
diff --git a/test/unit/expr/node_manager_black.cpp b/test/unit/node/node_manager_black.cpp
index a2ede3ed0..a2ede3ed0 100644
--- a/test/unit/expr/node_manager_black.cpp
+++ b/test/unit/node/node_manager_black.cpp
diff --git a/test/unit/expr/node_manager_white.cpp b/test/unit/node/node_manager_white.cpp
index daf211b78..daf211b78 100644
--- a/test/unit/expr/node_manager_white.cpp
+++ b/test/unit/node/node_manager_white.cpp
diff --git a/test/unit/expr/node_self_iterator_black.cpp b/test/unit/node/node_self_iterator_black.cpp
index 34ab5f09b..34ab5f09b 100644
--- a/test/unit/expr/node_self_iterator_black.cpp
+++ b/test/unit/node/node_self_iterator_black.cpp
diff --git a/test/unit/expr/node_traversal_black.cpp b/test/unit/node/node_traversal_black.cpp
index e443ff685..e443ff685 100644
--- a/test/unit/expr/node_traversal_black.cpp
+++ b/test/unit/node/node_traversal_black.cpp
diff --git a/test/unit/expr/node_white.cpp b/test/unit/node/node_white.cpp
index 651dd1990..651dd1990 100644
--- a/test/unit/expr/node_white.cpp
+++ b/test/unit/node/node_white.cpp
diff --git a/test/unit/expr/symbol_table_black.cpp b/test/unit/node/symbol_table_black.cpp
index 10fb52f6d..c1865eaa9 100644
--- a/test/unit/expr/symbol_table_black.cpp
+++ b/test/unit/node/symbol_table_black.cpp
@@ -31,11 +31,11 @@ using namespace context;
 
 namespace test {
 
-class TestSymbolTableBlack : public TestApi
+class TestNodeBlackSymbolTable : public TestApi
 {
 };
 
-TEST_F(TestSymbolTableBlack, bind1)
+TEST_F(TestNodeBlackSymbolTable, bind1)
 {
   SymbolTable symtab;
   api::Sort booleanType = d_solver.getBooleanSort();
@@ -45,7 +45,7 @@ TEST_F(TestSymbolTableBlack, bind1)
   ASSERT_EQ(symtab.lookup("x"), x);
 }
 
-TEST_F(TestSymbolTableBlack, bind2)
+TEST_F(TestNodeBlackSymbolTable, bind2)
 {
   SymbolTable symtab;
   api::Sort booleanType = d_solver.getBooleanSort();
@@ -56,7 +56,7 @@ TEST_F(TestSymbolTableBlack, bind2)
   ASSERT_EQ(symtab.lookup("x"), y);
 }
 
-TEST_F(TestSymbolTableBlack, bind3)
+TEST_F(TestNodeBlackSymbolTable, bind3)
 {
   SymbolTable symtab;
   api::Sort booleanType = d_solver.getBooleanSort();
@@ -69,7 +69,7 @@ TEST_F(TestSymbolTableBlack, bind3)
   ASSERT_EQ(symtab.lookup("x"), y);
 }
 
-TEST_F(TestSymbolTableBlack, bind4)
+TEST_F(TestNodeBlackSymbolTable, bind4)
 {
   SymbolTable symtab;
   api::Sort booleanType = d_solver.getBooleanSort();
@@ -86,7 +86,7 @@ TEST_F(TestSymbolTableBlack, bind4)
   ASSERT_EQ(symtab.lookupType("x"), t);
 }
 
-TEST_F(TestSymbolTableBlack, bind_type1)
+TEST_F(TestNodeBlackSymbolTable, bind_type1)
 {
   SymbolTable symtab;
   api::Sort s = d_solver.mkUninterpretedSort("S");
@@ -95,7 +95,7 @@ TEST_F(TestSymbolTableBlack, bind_type1)
   ASSERT_EQ(symtab.lookupType("S"), s);
 }
 
-TEST_F(TestSymbolTableBlack, bind_type2)
+TEST_F(TestNodeBlackSymbolTable, bind_type2)
 {
   SymbolTable symtab;
   // type name attribute shouldn't matter
@@ -105,7 +105,7 @@ TEST_F(TestSymbolTableBlack, bind_type2)
   ASSERT_EQ(symtab.lookupType("T"), s);
 }
 
-TEST_F(TestSymbolTableBlack, bind_type3)
+TEST_F(TestNodeBlackSymbolTable, bind_type3)
 {
   SymbolTable symtab;
   api::Sort s = d_solver.mkUninterpretedSort("S");
@@ -117,7 +117,7 @@ TEST_F(TestSymbolTableBlack, bind_type3)
   ASSERT_EQ(symtab.lookupType("S"), t);
 }
 
-TEST_F(TestSymbolTableBlack, push_scope)
+TEST_F(TestNodeBlackSymbolTable, push_scope)
 {
   SymbolTable symtab;
   api::Sort booleanType = d_solver.getBooleanSort();
@@ -139,7 +139,7 @@ TEST_F(TestSymbolTableBlack, push_scope)
   ASSERT_EQ(symtab.lookup("x"), x);
 }
 
-TEST_F(TestSymbolTableBlack, bad_pop)
+TEST_F(TestNodeBlackSymbolTable, bad_pop)
 {
   SymbolTable symtab;
   ASSERT_THROW(symtab.popScope(), ScopeException);
diff --git a/test/unit/expr/type_cardinality_black.cpp b/test/unit/node/type_cardinality_black.cpp
index 58024fa53..55936df0d 100644
--- a/test/unit/expr/type_cardinality_black.cpp
+++ b/test/unit/node/type_cardinality_black.cpp
@@ -27,11 +27,11 @@ using namespace kind;
 
 namespace test {
 
-class TestTypeCardinalityBlack : public TestNode
+class TestNodeBlackTypeCardinality : public TestNode
 {
 };
 
-TEST_F(TestTypeCardinalityBlack, basics)
+TEST_F(TestNodeBlackTypeCardinality, basics)
 {
   ASSERT_EQ(d_nodeManager->booleanType().getCardinality().compare(2),
             Cardinality::EQUAL);
@@ -43,7 +43,7 @@ TEST_F(TestTypeCardinalityBlack, basics)
       Cardinality::EQUAL);
 }
 
-TEST_F(TestTypeCardinalityBlack, arrays)
+TEST_F(TestNodeBlackTypeCardinality, arrays)
 {
   TypeNode intToInt = d_nodeManager->mkArrayType(d_nodeManager->integerType(),
                                                  d_nodeManager->integerType());
@@ -83,7 +83,7 @@ TEST_F(TestTypeCardinalityBlack, arrays)
   ASSERT_EQ(boolToBool.getCardinality().compare(4), Cardinality::EQUAL);
 }
 
-TEST_F(TestTypeCardinalityBlack, unary_functions)
+TEST_F(TestNodeBlackTypeCardinality, unary_functions)
 {
   TypeNode intToInt = d_nodeManager->mkFunctionType(
       d_nodeManager->integerType(), d_nodeManager->integerType());
@@ -123,7 +123,7 @@ TEST_F(TestTypeCardinalityBlack, unary_functions)
   ASSERT_EQ(boolToBool.getCardinality().compare(4), Cardinality::EQUAL);
 }
 
-TEST_F(TestTypeCardinalityBlack, binary_functions)
+TEST_F(TestNodeBlackTypeCardinality, binary_functions)
 {
   std::vector<TypeNode> boolbool;
   boolbool.push_back(d_nodeManager->booleanType());
@@ -279,7 +279,7 @@ TEST_F(TestTypeCardinalityBlack, binary_functions)
             Cardinality::GREATER);
 }
 
-TEST_F(TestTypeCardinalityBlack, ternary_functions)
+TEST_F(TestNodeBlackTypeCardinality, ternary_functions)
 {
   std::vector<TypeNode> boolbool;
   boolbool.push_back(d_nodeManager->booleanType());
@@ -306,7 +306,7 @@ TEST_F(TestTypeCardinalityBlack, ternary_functions)
             Cardinality::EQUAL);
 }
 
-TEST_F(TestTypeCardinalityBlack, undefined_sorts)
+TEST_F(TestNodeBlackTypeCardinality, undefined_sorts)
 {
   TypeNode foo = d_nodeManager->mkSort("foo", NodeManager::SORT_FLAG_NONE);
   // We've currently assigned them a specific Beth number, which
@@ -314,7 +314,7 @@ TEST_F(TestTypeCardinalityBlack, undefined_sorts)
   ASSERT_FALSE(foo.getCardinality().isFinite());
 }
 
-TEST_F(TestTypeCardinalityBlack, bitvectors)
+TEST_F(TestNodeBlackTypeCardinality, bitvectors)
 {
   ASSERT_EQ(d_nodeManager->mkBitVectorType(0).getCardinality().compare(0),
             Cardinality::EQUAL);
diff --git a/test/unit/expr/type_node_white.cpp b/test/unit/node/type_node_white.cpp
index f364e40fc..f364e40fc 100644
--- a/test/unit/expr/type_node_white.cpp
+++ b/test/unit/node/type_node_white.cpp