diff --git a/tests/test_archive.cpp b/tests/test_archive.cpp
new file mode 100644
index 00000000..42c13319
--- /dev/null
+++ b/tests/test_archive.cpp
@@ -0,0 +1,30 @@
+#include <boost/test/unit_test.hpp>
+#include "test_globals.hpp"
+#include <loaders/LoaderIMG.hpp>
+
+BOOST_AUTO_TEST_SUITE(ArchiveTests)
+
+BOOST_AUTO_TEST_CASE(test_open_archive)
+{
+	LoaderIMG loader;
+	
+	BOOST_REQUIRE( loader.load("test_data/models/gta3") );
+	
+	BOOST_CHECK( loader.getAssetCount() > 0 );
+	
+	LoaderIMGFile& f = loader.getAssetInfoByIndex(0);
+	
+	// A few assumptions..
+	
+	BOOST_CHECK_EQUAL( f.name, "radar00.txd" );
+	BOOST_CHECK_EQUAL( f.offset, 0);
+	BOOST_CHECK_EQUAL( f.size, 33);
+	
+	LoaderIMGFile& f2 = loader.getAssetInfo("radar00.txd");
+	
+	BOOST_CHECK_EQUAL( f2.name, f.name );
+	BOOST_CHECK_EQUAL( f2.offset, f.offset );
+	BOOST_CHECK_EQUAL( f2.size, f.size );
+}
+
+BOOST_AUTO_TEST_SUITE_END()
diff --git a/tests/test_globals.hpp b/tests/test_globals.hpp
index 8ef82ad4..4e6ab95e 100644
--- a/tests/test_globals.hpp
+++ b/tests/test_globals.hpp
@@ -16,7 +16,7 @@ public:
 		wnd.create(sf::VideoMode(640, 360), "Testing");
 		glewExperimental = GL_TRUE;
 		glewInit();
-		e = new GameWorld("data");
+		e = new GameWorld("test_data");
 	}
 
 	~Global() {
diff --git a/tests/test_loaderdff.cpp b/tests/test_loaderdff.cpp
new file mode 100644
index 00000000..e4dd0f67
--- /dev/null
+++ b/tests/test_loaderdff.cpp
@@ -0,0 +1,26 @@
+#include <boost/test/unit_test.hpp>
+#include "test_globals.hpp"
+#include <render/Model.hpp>
+
+BOOST_AUTO_TEST_SUITE(LoaderDFFTests)
+
+BOOST_AUTO_TEST_CASE(test_open_dff)
+{
+	LoaderIMG loader;
+	
+	BOOST_REQUIRE( loader.load("test_data/models/gta3") );
+
+	auto d = loader.loadToMemory("landstal.dff");
+	
+	LoaderDFF dffloader;
+	Model* m = dffloader.loadFromMemory(d, &Global::get().e->gameData);
+	
+	BOOST_REQUIRE( m != nullptr );
+	
+	BOOST_CHECK( m->frames.size() > 0 );
+	
+	delete d;
+	delete m;
+}
+
+BOOST_AUTO_TEST_SUITE_END()
diff --git a/tests/test_menu.cpp b/tests/test_menu.cpp
index 6719d45e..ccf5e181 100644
--- a/tests/test_menu.cpp
+++ b/tests/test_menu.cpp
@@ -65,6 +65,11 @@ BOOST_AUTO_TEST_CASE(menu_test_active_index)
 	
 	test.activate();
 	
+	BOOST_CHECK( clickindex == -1 );
+	
+	test.move( 1);
+	test.activate();
+	
 	BOOST_CHECK( clickindex == 0 );
 	
 	test.move( 1);