3 files changed, 1 insertions, 100 deletions
diff --git a/test/model/RangeSet.cpp b/test/core/model/RangeSet.cpp
index d026025..4f04538 100644
--- a/test/model/RangeSet.cpp
+++ b/test/core/model/RangeSet.cpp
@@ -18,7 +18,7 @@
 
 #include <gtest/gtest.h>
 
-#include <model/RangeSet.hpp>
+#include <core/model/RangeSet.hpp>
 
 namespace ousia {
 namespace model {
diff --git a/test/model/GraphNode.cpp b/test/model/GraphNode.cpp
deleted file mode 100644
index bdb633c..0000000
--- a/test/model/GraphNode.cpp
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
-    Ousía
-    Copyright (C) 2014  Benjamin Paaßen, Andreas Stöckel
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include <gtest/gtest.h>
-
-#include <model/GraphNode.hpp>
-
-namespace ousia {
-namespace model {
-
-// Make the protected constructor of GraphNode available
-class TestGraphNode : public GraphNode {
-
-public:
-	TestGraphNode(GraphNodeType type, std::shared_ptr<GraphNode> parent,
-			const std::string &name) :
-		GraphNode(type, parent, name)
-	{
-		// Do nothing here
-	}
-
-};
-
-TEST(GraphNodeTest, FullyQuallifiedNameTest)
-{
-	std::shared_ptr<GraphNode> nd1{new TestGraphNode(
-			GraphNodeType::Domain, nullptr, "node1")};
-	std::shared_ptr<GraphNode> nd2{new TestGraphNode(
-			GraphNodeType::Domain, nd1, "node2")};
-
-	ASSERT_STREQ("node1.node2", nd2->getFullyQualifiedName().c_str());
-}
-
-}
-}
-
diff --git a/test/model/domain/Layer.cpp b/test/model/domain/Layer.cpp
deleted file mode 100644
index 89aeaa4..0000000
--- a/test/model/domain/Layer.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
-    Ousía
-    Copyright (C) 2014  Benjamin Paaßen, Andreas Stöckel
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include <gtest/gtest.h>
-#include <iostream>
-
-#include <model/domain/Layer.hpp>
-#include <model/domain/Annotation.hpp>
-
-namespace ousia {
-namespace domain{
-
-TEST(LayerTest, AnnotationManagementTest)
-{
-	std::shared_ptr<Annotation> anno1{new Annotation("em1")};
-	std::shared_ptr<Annotation> anno2{new Annotation("em2", anno1)};
-
-	Layer layer {"layer"};
-
-	std::vector<std::shared_ptr<Annotation>>& annos = layer.getAnnotations();
-
-	annos.push_back(anno1);
-	annos.push_back(anno2);
-
-	std::vector<std::shared_ptr<Annotation>>& test_annos = layer.getAnnotations();
-
-	ASSERT_EQ(2, test_annos.size());
-	ASSERT_EQ(anno1, test_annos[0]);
-	ASSERT_EQ(anno2, test_annos[1]);
-}
-
-}
-}