diff --git a/test/Longevity/Makefile2 b/test/Longevity/Makefile2
deleted file mode 100755
index 455e0d6..0000000
--- a/test/Longevity/Makefile2
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-CPP = g++
-CC = gcc
-OBJ = main2.o 
-LINKOBJ = main2.o
-CXXINCS = -I./../../include
-LIBS = -L../../lib -lloki
-CXXFLAGS = $(CXXINCS) -O2 -DNDEBUG
-BIN = main2-gcc.exe
-RM = rm -f
-CHK_DIR_EXISTS= if not exist
-MKDIR = mkdir
-
-.PHONY: all all-before all-after clean clean-custom
-
-all: all-before $(BIN) all-after
-
-
-clean: clean-custom
-	${RM} $(OBJ) $(BIN)
-
-$(BIN): $(OBJ)
-	$(CPP) $(LINKOBJ) -o main2-gcc.exe $(LIBS)
-
-check_tmp: 
-	@$(CHK_DIR_EXISTS) "" $(MKDIR) "tmp"
-	
-Factory.o: Factory.cpp
-	$(CPP) -c main2.cpp -o main2.o $(CXXFLAGS)
-
-
diff --git a/test/Singleton/Makefile-DeletableSingleton b/test/Singleton/Makefile-DeletableSingleton
deleted file mode 100755
index ad24a75..0000000
--- a/test/Singleton/Makefile-DeletableSingleton
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-CPP = g++
-CC = gcc
-OBJ = DeletableSingleton.o 
-LINKOBJ = DeletableSingleton.o
-CXXINCS = -I./../../include
-LIBS = -L../../lib -lloki
-CXXFLAGS = $(CXXINCS) -O2 -DNDEBUG
-BIN = DeletableSingleton-gcc.exe
-RM = rm -f
-CHK_DIR_EXISTS= if not exist
-MKDIR = mkdir
-
-.PHONY: all all-before all-after clean clean-custom
-
-all: all-before $(BIN) all-after
-
-
-clean: clean-custom
-	${RM} $(OBJ) $(BIN)
-
-$(BIN): $(OBJ)
-	$(CPP) $(LINKOBJ) -o DeletableSingleton-gcc.exe $(LIBS)
-
-check_tmp: 
-	@$(CHK_DIR_EXISTS) "" $(MKDIR) "tmp"
-	
-Factory.o: Factory.cpp
-	$(CPP) -c DeletableSingleton.cpp -o DeletableSingleton.o $(CXXFLAGS)
-
-
diff --git a/test/Singleton/Makefile-Dependencies b/test/Singleton/Makefile-Dependencies
deleted file mode 100755
index 08800af..0000000
--- a/test/Singleton/Makefile-Dependencies
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-CPP = g++
-CC = gcc
-OBJ = Dependencies.o 
-LINKOBJ = Dependencies.o
-CXXINCS = -I./../../include
-LIBS = -L../../lib -lloki
-CXXFLAGS = $(CXXINCS) -O2 -DNDEBUG
-BIN = Dependencies-gcc.exe
-RM = rm -f
-CHK_DIR_EXISTS= if not exist
-MKDIR = mkdir
-
-.PHONY: all all-before all-after clean clean-custom
-
-all: all-before $(BIN) all-after
-
-
-clean: clean-custom
-	${RM} $(OBJ) $(BIN)
-
-$(BIN): $(OBJ)
-	$(CPP) $(LINKOBJ) -o Dependencies-gcc.exe $(LIBS)
-
-check_tmp: 
-	@$(CHK_DIR_EXISTS) "" $(MKDIR) "tmp"
-	
-Factory.o: Factory.cpp
-	$(CPP) -c Dependencies.cpp -o Dependencies.o $(CXXFLAGS)
-
-
diff --git a/test/Singleton/Makefile-Phoenix b/test/Singleton/Makefile-Phoenix
deleted file mode 100755
index 47c19fb..0000000
--- a/test/Singleton/Makefile-Phoenix
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-CPP = g++
-CC = gcc
-OBJ = Phoenix.o 
-LINKOBJ = Phoenix.o
-CXXINCS = -I./../../include
-LIBS = -L../../lib -lloki
-CXXFLAGS = $(CXXINCS) -O2 -DNDEBUG
-BIN = Phoenix-gcc.exe
-RM = rm -f
-CHK_DIR_EXISTS= if not exist
-MKDIR = mkdir
-
-.PHONY: all all-before all-after clean clean-custom
-
-all: all-before $(BIN) all-after
-
-
-clean: clean-custom
-	${RM} $(OBJ) $(BIN)
-
-$(BIN): $(OBJ)
-	$(CPP) $(LINKOBJ) -o Phoenix-gcc.exe $(LIBS)
-
-check_tmp: 
-	@$(CHK_DIR_EXISTS) "" $(MKDIR) "tmp"
-	
-Factory.o: Factory.cpp
-	$(CPP) -c Phoenix.cpp -o Phoenix.o $(CXXFLAGS)
-
-
diff --git a/test/SmallObj/Makefile-SmallSingleton b/test/SmallObj/Makefile-SmallSingleton
deleted file mode 100755
index 4e5e002..0000000
--- a/test/SmallObj/Makefile-SmallSingleton
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-CPP = g++
-CC = gcc
-OBJ = SmallSingleton.o 
-LINKOBJ = SmallSingleton.o 
-LIBS = -L../../lib -lloki
-CXXINCS = -I./../../include -I./../../include/loki 
-CXXFLAGS = $(CXXINCS) -DNDEBUG -fexpensive-optimizations -O3 
-BIN = SmallSingleton-gcc.exe
-RM = rm -f
-CHK_DIR_EXISTS= if not exist
-MKDIR = mkdir
-
-.PHONY: all all-before all-after clean clean-custom
-
-all: clean all-before $(BIN) all-after
-
-
-clean: clean-custom
-	${RM} $(OBJ) $(BIN)
-
-$(BIN): $(OBJ)
-	$(CPP) $(LINKOBJ) -o SmallSingleton-gcc.exe $(LIBS) 
-	
-check_tmp: 
-	@$(CHK_DIR_EXISTS) "" $(MKDIR) "tmp"
-
-SmallSingleton.o: SmallSingleton.cpp
-	$(CPP) -c SmallSingleton.cpp -o SmallSingleton.o $(CXXFLAGS)
-