7 files changed, 14 insertions, 20 deletions
diff --git a/test/core/utils/BufferedCharReaderTest.cpp b/test/core/BufferedCharReaderTest.cpp
index 69c0974..41e70ce 100644
--- a/test/core/utils/BufferedCharReaderTest.cpp
+++ b/test/core/BufferedCharReaderTest.cpp
@@ -21,10 +21,9 @@
 
 #include "gtest/gtest.h"
 
-#include <core/utils/BufferedCharReader.hpp>
+#include <core/BufferedCharReader.hpp>
 
 namespace ousia{
-namespace utils{
 
 TEST(BufferedCharReaderTest, SimpleReadTest)
 {
@@ -200,4 +199,4 @@ TEST(BufferedCharReaderTest, RowColumnCounterUTF8Test)
 }
 
 }
-}
+
diff --git a/test/core/utils/CSSParserTest.cpp b/test/core/CSSParserTest.cpp
index 920752b..a09c8ff 100644
--- a/test/core/utils/CSSParserTest.cpp
+++ b/test/core/CSSParserTest.cpp
@@ -18,10 +18,9 @@
 
 #include <gtest/gtest.h>
 
-#include <core/utils/CSSParser.hpp>
+#include <core/CSSParser.hpp>
 
 namespace ousia {
-namespace utils {
 TEST(Specificity, testOperators)
 {
 	Specificity s1{0,0,1};
@@ -113,4 +112,4 @@ TEST(Specificity, testOperators)
 	ASSERT_FALSE(s5 > s5);
 }
 }
-}
+
diff --git a/test/core/utils/CodeTokenizerTest.cpp b/test/core/CodeTokenizerTest.cpp
index 0b9d7b3..1432564 100644
--- a/test/core/utils/CodeTokenizerTest.cpp
+++ b/test/core/CodeTokenizerTest.cpp
@@ -18,10 +18,9 @@
 
 #include <gtest/gtest.h>
 
-#include <core/utils/CodeTokenizer.hpp>
+#include <core/CodeTokenizer.hpp>
 
 namespace ousia {
-namespace utils {
 
 static const int BLOCK_COMMENT = 30;
 static const int LINE_COMMENT = 31;
@@ -40,8 +39,8 @@ TEST(CodeTokenizer, testTokenizer)
 	reader.feed("var my_string = 'My \\'String\\'';\n");  // 4
 	reader.feed("// and a line comment\n");               // 5
 	reader.feed("var my_obj = { a = 4;}");                // 6
-	//           123456789012345678901234567890123456789012345678901234567890123456789
-	//           0        1         2         3         4         5         6
+	//           123456789012345678901234567890123456789
+	//           0        1         2         3
 	TokenTreeNode root{{{"/*", 1},
 	                    {"*/", 2},
 	                    {"//", 3},
@@ -99,4 +98,4 @@ TEST(CodeTokenizer, testTokenizer)
 	ASSERT_FALSE(tokenizer.next(t));
 }
 }
-}
+
diff --git a/test/core/dom/NodeTest.cpp b/test/core/NodeTest.cpp
index 1291d60..9537d29 100644
--- a/test/core/dom/NodeTest.cpp
+++ b/test/core/NodeTest.cpp
@@ -20,7 +20,7 @@
 
 #include <core/Managed.hpp>
 
-#include <core/dom/Node.hpp>
+#include <core/Node.hpp>
 
 namespace ousia {
 namespace dom {
diff --git a/test/core/utils/RangeSetTest.cpp b/test/core/RangeSetTest.cpp
index 9be4c17..e158233 100644
--- a/test/core/utils/RangeSetTest.cpp
+++ b/test/core/RangeSetTest.cpp
@@ -18,10 +18,9 @@
 
 #include <gtest/gtest.h>
 
-#include <core/utils/RangeSet.hpp>
+#include <core/RangeSet.hpp>
 
 namespace ousia {
-namespace model {
 
 TEST(Range, IsValid)
 {
@@ -218,5 +217,4 @@ TEST(RangeSet, Contains)
 }
 
 }
-}
 
diff --git a/test/core/utils/TokenizerTest.cpp b/test/core/TokenizerTest.cpp
index 79cc01d..da6b578 100644
--- a/test/core/utils/TokenizerTest.cpp
+++ b/test/core/TokenizerTest.cpp
@@ -18,12 +18,11 @@
 
 #include <gtest/gtest.h>
 
-#include <core/utils/BufferedCharReader.hpp>
+#include <core/BufferedCharReader.hpp>
 
-#include <core/utils/Tokenizer.hpp>
+#include <core/Tokenizer.hpp>
 
 namespace ousia {
-namespace utils {
 TEST(TokenTreeNode, testConstructor)
 {
 	TokenTreeNode root{{{"a", 1}, {"aab", 2}, {"aac", 3}, {"abd", 4}}};
@@ -122,4 +121,4 @@ TEST(Tokenizer, testIncompleteTokens)
 	ASSERT_FALSE(tokenizer.next(t));
 }
 }
-}
+
diff --git a/test/core/utils/UtilsTest.cpp b/test/core/UtilsTest.cpp
index d349c6f..4f754a5 100644
--- a/test/core/utils/UtilsTest.cpp
+++ b/test/core/UtilsTest.cpp
@@ -18,7 +18,7 @@
 
 #include <gtest/gtest.h>
 
-#include <core/utils/Utils.hpp>
+#include <core/Utils.hpp>
 
 namespace ousia {