diff --git a/test/codeblocks/ETL.cbp b/test/codeblocks/ETL.cbp
index 3a8a14eb..3f2c6be0 100644
--- a/test/codeblocks/ETL.cbp
+++ b/test/codeblocks/ETL.cbp
@@ -15,7 +15,12 @@
+
+
+
+
+
@@ -55,10 +60,6 @@
-
-
-
-
diff --git a/test/codeblocks/ETL.depend b/test/codeblocks/ETL.depend
index 6aaf8ac4..bedccc4d 100644
--- a/test/codeblocks/ETL.depend
+++ b/test/codeblocks/ETL.depend
@@ -133,28 +133,29 @@
1414845610 u:\users\john\documents\programming\github\unittest-cpp\unittest++\reportassert.h
"HelperMacros.h"
-1415108264 source:u:\users\john\documents\programming\github\etl\test\test_array.cpp
+1415139017 source:u:\users\john\documents\programming\github\etl\test\test_array.cpp
"../array.h"
+
-1414960505 u:\users\john\documents\programming\github\etl\array.h
+1415195892 u:\users\john\documents\programming\github\etl\array.h
"exception.h"
-1414076884 u:\users\john\documents\programming\github\etl\exception.h
+1415195892 u:\users\john\documents\programming\github\etl\exception.h
1414586788 source:u:\users\john\documents\programming\github\etl\test\test_container.cpp
"../container.h"
-1415108264 u:\users\john\documents\programming\github\etl\container.h
+1415195892 u:\users\john\documents\programming\github\etl\container.h
1414929413 source:u:\users\john\documents\programming\github\etl\test\test_crc.cpp
@@ -169,62 +170,62 @@
"../crc32.h"
"../crc64_ecma.h"
-1414930079 u:\users\john\documents\programming\github\etl\crc8_ccitt.h
+1415195892 u:\users\john\documents\programming\github\etl\crc8_ccitt.h
-1414930079 u:\users\john\documents\programming\github\etl\crc16.h
+1415195892 u:\users\john\documents\programming\github\etl\crc16.h
-1414930079 u:\users\john\documents\programming\github\etl\crc16_ccitt.h
+1415195892 u:\users\john\documents\programming\github\etl\crc16_ccitt.h
1414884332 u:\users\john\documents\programming\github\etl\crc16_kermit.h
-1414930079 u:\users\john\documents\programming\github\etl\crc32.h
+1415195892 u:\users\john\documents\programming\github\etl\crc32.h
-1414930078 u:\users\john\documents\programming\github\etl\crc64_ecma.h
+1415195892 u:\users\john\documents\programming\github\etl\crc64_ecma.h
-1414960505 source:u:\users\john\documents\programming\github\etl\test\test_cyclic_value.cpp
+1415139747 source:u:\users\john\documents\programming\github\etl\test\test_cyclic_value.cpp
"../cyclic_value.h"
-1415110201 u:\users\john\documents\programming\github\etl\cyclic_value.h
+1415195892 u:\users\john\documents\programming\github\etl\cyclic_value.h
"static_assert.h"
"exception.h"
-1415110494 u:\users\john\documents\programming\github\etl\static_assert.h
+1415195891 u:\users\john\documents\programming\github\etl\static_assert.h
-1415015829 source:u:\users\john\documents\programming\github\etl\test\test_deque.cpp
+1415139641 source:u:\users\john\documents\programming\github\etl\test\test_deque.cpp
"../deque.h"
-1415112054 u:\users\john\documents\programming\github\etl\deque.h
+1415195892 u:\users\john\documents\programming\github\etl\deque.h
"ideque.h"
"container.h"
-1415112008 u:\users\john\documents\programming\github\etl\ideque.h
+1415195892 u:\users\john\documents\programming\github\etl\ideque.h
"type_traits.h"
"deque_base.h"
-1415110718 u:\users\john\documents\programming\github\etl\type_traits.h
+1415196262 u:\users\john\documents\programming\github\etl\type_traits.h
"nullptr.h"
-1414848127 u:\users\john\documents\programming\github\etl\nullptr.h
+1415195892 u:\users\john\documents\programming\github\etl\nullptr.h
-1414960505 u:\users\john\documents\programming\github\etl\deque_base.h
+1415195892 u:\users\john\documents\programming\github\etl\deque_base.h
"exception.h"
@@ -233,7 +234,7 @@
"../enum_type.h"
-1414345217 u:\users\john\documents\programming\github\etl\enum_type.h
+1415195892 u:\users\john\documents\programming\github\etl\enum_type.h
1414344663 source:u:\users\john\documents\programming\github\etl\test\test_exception.cpp
@@ -244,16 +245,16 @@
"../function.h"
-1414347269 u:\users\john\documents\programming\github\etl\function.h
+1415195892 u:\users\john\documents\programming\github\etl\function.h
1414583364 source:u:\users\john\documents\programming\github\etl\test\test_largest.cpp
"../largest.h"
-1414584475 u:\users\john\documents\programming\github\etl\largest.h
+1415195892 u:\users\john\documents\programming\github\etl\largest.h
-1415010331 source:u:\users\john\documents\programming\github\etl\test\test_list.cpp
+1415139572 source:u:\users\john\documents\programming\github\etl\test\test_list.cpp
"ExtraCheckMacros.h"
"../list.h"
@@ -272,11 +273,11 @@
-1414938217 u:\users\john\documents\programming\github\etl\list.h
+1415195892 u:\users\john\documents\programming\github\etl\list.h
"ilist.h"
-1415112096 u:\users\john\documents\programming\github\etl\ilist.h
+1415195892 u:\users\john\documents\programming\github\etl\ilist.h
@@ -284,7 +285,7 @@
"nullptr.h"
"list_base.h"
-1414960505 u:\users\john\documents\programming\github\etl\list_base.h
+1415195892 u:\users\john\documents\programming\github\etl\list_base.h
"exception.h"
@@ -293,10 +294,10 @@
"../log.h"
"../pow.h"
-1414930734 u:\users\john\documents\programming\github\etl\log.h
+1415195892 u:\users\john\documents\programming\github\etl\log.h
-1414930738 u:\users\john\documents\programming\github\etl\pow.h
+1415195892 u:\users\john\documents\programming\github\etl\pow.h
1414585087 source:u:\users\john\documents\programming\github\etl\test\test_numeric.cpp
@@ -305,71 +306,71 @@
-1414584948 u:\users\john\documents\programming\github\etl\numeric.h
+1415195891 u:\users\john\documents\programming\github\etl\numeric.h
-1414960505 source:u:\users\john\documents\programming\github\etl\test\test_observer.cpp
+1415136649 source:u:\users\john\documents\programming\github\etl\test\test_observer.cpp
"../observer.h"
-1415112181 u:\users\john\documents\programming\github\etl\observer.h
+1415195892 u:\users\john\documents\programming\github\etl\observer.h
"vector.h"
"exception.h"
-1414776720 u:\users\john\documents\programming\github\etl\vector.h
+1415195892 u:\users\john\documents\programming\github\etl\vector.h
"ivector.h"
-1414960505 u:\users\john\documents\programming\github\etl\ivector.h
+1415195892 u:\users\john\documents\programming\github\etl\ivector.h
"vector_base.h"
-1414960505 u:\users\john\documents\programming\github\etl\vector_base.h
+1415195892 u:\users\john\documents\programming\github\etl\vector_base.h
"exception.h"
-1414960084 source:u:\users\john\documents\programming\github\etl\test\test_queue.cpp
+1415139745 source:u:\users\john\documents\programming\github\etl\test\test_queue.cpp
"../queue.h"
-1414584577 u:\users\john\documents\programming\github\etl\queue.h
+1415195892 u:\users\john\documents\programming\github\etl\queue.h
"iqueue.h"
-1414960084 u:\users\john\documents\programming\github\etl\iqueue.h
+1415195892 u:\users\john\documents\programming\github\etl\iqueue.h
"queue_base.h"
-1414960505 u:\users\john\documents\programming\github\etl\queue_base.h
+1415195892 u:\users\john\documents\programming\github\etl\queue_base.h
"exception.h"
-1414960128 source:u:\users\john\documents\programming\github\etl\test\test_stack.cpp
+1415139315 source:u:\users\john\documents\programming\github\etl\test\test_stack.cpp
"../stack.h"
-1414584577 u:\users\john\documents\programming\github\etl\stack.h
+1415195892 u:\users\john\documents\programming\github\etl\stack.h
"istack.h"
-1414960128 u:\users\john\documents\programming\github\etl\istack.h
+1415195892 u:\users\john\documents\programming\github\etl\istack.h
"stack_base.h"
-1414960505 u:\users\john\documents\programming\github\etl\stack_base.h
+1415195892 u:\users\john\documents\programming\github\etl\stack_base.h
"exception.h"
-1415117116 source:u:\users\john\documents\programming\github\etl\test\test_type_traits.cpp
+1415196048 source:u:\users\john\documents\programming\github\etl\test\test_type_traits.cpp
"../type_traits.h"
-1414960505 source:u:\users\john\documents\programming\github\etl\test\test_vector.cpp
+1415185403 source:u:\users\john\documents\programming\github\etl\test\test_vector.cpp
@@ -380,7 +381,7 @@
"../visitor.h"
-1414764533 u:\users\john\documents\programming\github\etl\visitor.h
+1415195892 u:\users\john\documents\programming\github\etl\visitor.h
1414845610 source:u:\users\john\documents\programming\github\unittest-cpp\unittest++\assertexception.cpp
"AssertException.h"
@@ -430,3 +431,77 @@
+1414845610 source:u:\users\john\documents\programming\github\unittest-cpp\unittest++\reportassert.cpp
+ "ReportAssert.h"
+ "ReportAssertImpl.h"
+ "AssertException.h"
+ "CurrentTest.h"
+ "TestResults.h"
+ "TestDetails.h"
+ "ReportAssertImpl.h"
+
+1414845610 source:u:\users\john\documents\programming\github\unittest-cpp\unittest++\test.cpp
+ "Config.h"
+ "Test.h"
+ "TestList.h"
+ "TestResults.h"
+ "AssertException.h"
+ "MemoryOutStream.h"
+ "ExecuteTest.h"
+ "Posix/SignalTranslator.h"
+
+1414845610 source:u:\users\john\documents\programming\github\unittest-cpp\unittest++\testdetails.cpp
+ "TestDetails.h"
+
+1414845610 source:u:\users\john\documents\programming\github\unittest-cpp\unittest++\testlist.cpp
+ "TestList.h"
+ "Test.h"
+
+
+1414845610 source:u:\users\john\documents\programming\github\unittest-cpp\unittest++\testreporter.cpp
+ "TestReporter.h"
+
+1414845610 source:u:\users\john\documents\programming\github\unittest-cpp\unittest++\testreporterstdout.cpp
+ "TestReporterStdout.h"
+
+ "TestDetails.h"
+
+1414845610 u:\users\john\documents\programming\github\unittest-cpp\unittest++\testreporterstdout.h
+ "TestReporter.h"
+
+1414845610 source:u:\users\john\documents\programming\github\unittest-cpp\unittest++\testresults.cpp
+ "TestResults.h"
+ "TestReporter.h"
+ "TestDetails.h"
+
+1414845610 source:u:\users\john\documents\programming\github\unittest-cpp\unittest++\testrunner.cpp
+ "TestRunner.h"
+ "TestResults.h"
+ "TestReporter.h"
+ "TestReporterStdout.h"
+ "TimeHelpers.h"
+ "MemoryOutStream.h"
+
+
+1414845610 source:u:\users\john\documents\programming\github\unittest-cpp\unittest++\timeconstraint.cpp
+ "TimeConstraint.h"
+ "TestResults.h"
+ "MemoryOutStream.h"
+ "CurrentTest.h"
+
+1414845610 source:u:\users\john\documents\programming\github\unittest-cpp\unittest++\win32\timehelpers.cpp
+ "TimeHelpers.h"
+
+
+1414845610 source:u:\users\john\documents\programming\github\unittest-cpp\unittest++\xmltestreporter.cpp
+ "Config.h"
+ "XmlTestReporter.h"
+
+
+
+
+1414845610 u:\users\john\documents\programming\github\unittest-cpp\unittest++\xmltestreporter.h
+ "Config.h"
+ "DeferredTestReporter.h"
+
+
diff --git a/test/codeblocks/ETL.layout b/test/codeblocks/ETL.layout
index 07eede25..649ad0b2 100644
--- a/test/codeblocks/ETL.layout
+++ b/test/codeblocks/ETL.layout
@@ -1,11 +1,96 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -16,84 +101,14 @@
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-