diff --git a/test/codeblocks/ETL.cbp b/test/codeblocks/ETL.cbp
index f38ea2a7..d25c0e6f 100644
--- a/test/codeblocks/ETL.cbp
+++ b/test/codeblocks/ETL.cbp
@@ -258,11 +258,7 @@
-<<<<<<< HEAD
-
-=======
->>>>>>> origin/feature/Timer_triggered_messages
diff --git a/test/codeblocks/ETL.depend b/test/codeblocks/ETL.depend
deleted file mode 100644
index 707aee8a..00000000
--- a/test/codeblocks/ETL.depend
+++ /dev/null
@@ -1,12063 +0,0 @@
-# depslib dependency file v1.0
-1424729709 source:u:\users\john\documents\programming\github\etl\crc16.cpp
-
-
-1507907758
-
-1424729709 source:u:\users\john\documents\programming\github\etl\crc16_ccitt.cpp
-
-
-1424729709 source:u:\users\john\documents\programming\github\etl\crc32.cpp
-
-
-1424729709 source:u:\users\john\documents\programming\github\etl\crc64_ecma.cpp
-
-
-1424729709 source:u:\users\john\documents\programming\github\etl\crc8_ccitt.cpp
-
-
-1424729709 source:u:\users\john\documents\programming\github\etl\test\main.cpp
-
-
-1452692153 +/UnitTest++.h>
-
-1414849210 u:\users\john\documents\programming\github\unittest-cpp\unittest++\unittest++.h
- "UnitTestPP.h"
-
-1494161659 P.h"
-
-1414849210 u:\users\john\documents\programming\github\unittest-cpp\unittest++\unittestpp.h
- "Config.h"
- "TestMacros.h"
- "CheckMacros.h"
- "TestRunner.h"
- "TimeConstraint.h"
- "ReportAssert.h"
-
-1494161659 ert.h"
-
-1414849210 u:\users\john\documents\programming\github\unittest-cpp\unittest++\config.h
-
-1416833504 u:\users\john\documents\programming\github\unittest-cpp\unittest++\testmacros.h
- "Config.h"
- "TestSuite.h"
- "ExceptionMacros.h"
- "ExecuteTest.h"
- "AssertException.h"
- "TestDetails.h"
- "MemoryOutStream.h"
- "Posix/SignalTranslator.h"
-
-1494165259 nalTranslator.h"
-
-1416833496 u:\users\john\documents\programming\github\unittest-cpp\unittest++\testsuite.h
-
-1414849210 u:\users\john\documents\programming\github\unittest-cpp\unittest++\exceptionmacros.h
- "Config.h"
-
-1414849210 u:\users\john\documents\programming\github\unittest-cpp\unittest++\executetest.h
- "Config.h"
- "ExceptionMacros.h"
- "TestDetails.h"
- "TestResults.h"
- "MemoryOutStream.h"
- "AssertException.h"
- "CurrentTest.h"
- "ReportAssertImpl.h"
- "Posix/SignalTranslator.h"
-
-1414849210 u:\users\john\documents\programming\github\unittest-cpp\unittest++\testdetails.h
- "HelperMacros.h"
-
-1494165259 ros.h"
-
-1414849210 u:\users\john\documents\programming\github\unittest-cpp\unittest++\helpermacros.h
- "Config.h"
-
-1414849210 u:\users\john\documents\programming\github\unittest-cpp\unittest++\testresults.h
- "HelperMacros.h"
-
-1417973669 u:\users\john\documents\programming\github\unittest-cpp\unittest++\memoryoutstream.h
- "Config.h"
- "HelperMacros.h"
-
-
-
-1414849210 u:\users\john\documents\programming\github\unittest-cpp\unittest++\assertexception.h
- "Config.h"
- "HelperMacros.h"
-
-
-1507807483 >
-
-1414849210 u:\users\john\documents\programming\github\unittest-cpp\unittest++\currenttest.h
- "HelperMacros.h"
-
-1414849210 u:\users\john\documents\programming\github\unittest-cpp\unittest++\reportassertimpl.h
- "Config.h"
- "HelperMacros.h"
-
-
-1417875049 u:\users\john\documents\programming\github\unittest-cpp\unittest++\posix\signaltranslator.h
-
-
-
-1414931290 u:\users\john\documents\programming\github\unittest-cpp\unittest++\checkmacros.h
- "HelperMacros.h"
- "ExceptionMacros.h"
- "Checks.h"
- "AssertException.h"
- "MemoryOutStream.h"
- "TestDetails.h"
- "CurrentTest.h"
- "ReportAssertImpl.h"
-
-1494165259 ertImpl.h"
-
-1414849210 u:\users\john\documents\programming\github\unittest-cpp\unittest++\checks.h
- "Config.h"
- "TestResults.h"
- "MemoryOutStream.h"
-
-1494161659 Stream.h"
-
-1414849210 u:\users\john\documents\programming\github\unittest-cpp\unittest++\testrunner.h
- "Test.h"
- "TestList.h"
- "CurrentTest.h"
-
-1494165259 st.h"
-
-1414849210 u:\users\john\documents\programming\github\unittest-cpp\unittest++\test.h
- "TestDetails.h"
-
-1494165259 ls.h"
-
-1414849210 u:\users\john\documents\programming\github\unittest-cpp\unittest++\testlist.h
- "HelperMacros.h"
-
-1414849210 u:\users\john\documents\programming\github\unittest-cpp\unittest++\timeconstraint.h
- "TimeHelpers.h"
- "HelperMacros.h"
-
-1414849210 u:\users\john\documents\programming\github\unittest-cpp\unittest++\timehelpers.h
- "Config.h"
- "Posix/TimeHelpers.h"
- "Win32/TimeHelpers.h"
-
-1494165259 eHelpers.h"
-
-1414849210 u:\users\john\documents\programming\github\unittest-cpp\unittest++\posix\timehelpers.h
-
-
-1494165259 h>
-
-1414849210 u:\users\john\documents\programming\github\unittest-cpp\unittest++\win32\timehelpers.h
- "../Config.h"
- "../HelperMacros.h"
-
-1494165259 Macros.h"
-
-1414849210 u:\users\john\documents\programming\github\unittest-cpp\unittest++\reportassert.h
- "HelperMacros.h"
-
-1428227985 source:u:\users\john\documents\programming\github\etl\test\test_array.cpp
-
- "../array.h"
-
-
-
- "../integral_limits.h"
-
-1452516033 al_limits.h"
-
-1424729709 u:\users\john\documents\programming\github\etl\array.h
-
-
-
-
- "exception.h"
- "type_traits.h"
- "parameter_type.h"
- "static_assert.h"
- "error_handler.h"
-
-1494277861 dler.h"
-
-1507728173 .h"
-
-1424729709 u:\users\john\documents\programming\github\etl\exception.h
-
-1424729709 source:u:\users\john\documents\programming\github\etl\test\test_container.cpp
-
- "../container.h"
-
-
-1452516033 ner.h"
-
-1424729709 u:\users\john\documents\programming\github\etl\container.h
-
-
-
-1424729709 source:u:\users\john\documents\programming\github\etl\test\test_crc.cpp
-
-
-
-
-
- "../crc8_ccitt.h"
- "../crc16.h"
- "../crc16_ccitt.h"
- "../crc16_kermit.h"
- "../crc32.h"
- "../crc64_ecma.h"
- "../endian.h"
-
-1452701006 ecma.h"
-
-1424729709 u:\users\john\documents\programming\github\etl\crc8_ccitt.h
-
- "static_assert.h"
- "type_traits.h"
- "endian.h"
- "ihash.h"
-
-1424729709 u:\users\john\documents\programming\github\etl\crc16.h
-
- "static_assert.h"
- "type_traits.h"
- "endian.h"
- "ihash.h"
-
-1424729709 u:\users\john\documents\programming\github\etl\crc16_ccitt.h
-
- "static_assert.h"
- "type_traits.h"
- "endian.h"
- "ihash.h"
-
-1424729709 u:\users\john\documents\programming\github\etl\crc16_kermit.h
-
- "static_assert.h"
- "type_traits.h"
- "endian.h"
- "ihash.h"
-
-1424729709 u:\users\john\documents\programming\github\etl\crc32.h
-
- "static_assert.h"
- "type_traits.h"
- "endian.h"
- "ihash.h"
-
-1424729709 u:\users\john\documents\programming\github\etl\crc64_ecma.h
-
- "static_assert.h"
- "type_traits.h"
- "endian.h"
- "ihash.h"
-
-1424729709 source:u:\users\john\documents\programming\github\etl\test\test_cyclic_value.cpp
-
- "../cyclic_value.h"
-
-1452516033 _value.h"
-
-1424729709 u:\users\john\documents\programming\github\etl\cyclic_value.h
-
-
- "static_assert.h"
- "exception.h"
-
-1424729709 u:\users\john\documents\programming\github\etl\static_assert.h
-
-1427741862 source:u:\users\john\documents\programming\github\etl\test\test_deque.cpp
-
- "ExtraCheckMacros.h"
- "../deque.h"
- "data.h"
-
-
-
-
-
-
-1427740329 u:\users\john\documents\programming\github\etl\deque.h
-
-
-
-
- "ideque.h"
- "container.h"
- "alignment.h"
- "array.h"
-
-1424729709 u:\users\john\documents\programming\github\etl\ideque.h
-
-
- "algorithm.h"
- "type_traits.h"
- "deque_base.h"
- "parameter_type.h"
- "error_handler.h"
-
-1415199768 e.h"
-
-1427740329 u:\users\john\documents\programming\github\etl\type_traits.h
-
- "nullptr.h"
-
-1507064935 "
-
-1424729709 u:\users\john\documents\programming\github\etl\nullptr.h
-
-1424729709 u:\users\john\documents\programming\github\etl\deque_base.h
-
- "exception.h"
-
-1424729709 source:u:\users\john\documents\programming\github\etl\test\test_enum_type.cpp
-
-
- "../enum_type.h"
-
-1452516033 ype.h"
-
-1424729709 u:\users\john\documents\programming\github\etl\enum_type.h
-
-1424729709 source:u:\users\john\documents\programming\github\etl\test\test_exception.cpp
-
-
- "../exception.h"
-
-1452516033 ion.h"
-
-1424729709 source:u:\users\john\documents\programming\github\etl\test\test_function.cpp
-
- "../function.h"
-
-1452516033 on.h"
-
-1424729709 u:\users\john\documents\programming\github\etl\function.h
-
-1424729709 source:u:\users\john\documents\programming\github\etl\test\test_largest.cpp
-
- "../largest.h"
-
-
-1506012495 ts>
-
-1424729709 u:\users\john\documents\programming\github\etl\largest.h
- "type_traits.h"
-
-1494165259 ts.h"
-
-1424729709 source:u:\users\john\documents\programming\github\etl\test\test_list.cpp
-
- "ExtraCheckMacros.h"
- "../list.h"
- "data.h"
-
-
-
-
-
-1428221662 source:u:\users\john\documents\programming\github\etl\test\test_map.cpp
-
-