diff --git a/test/codeblocks/ETL.cbp b/test/codeblocks/ETL.cbp
index b922aa41..3f909bd3 100644
--- a/test/codeblocks/ETL.cbp
+++ b/test/codeblocks/ETL.cbp
@@ -196,6 +196,7 @@
 		<Unit filename="../test_enum_type.cpp" />
 		<Unit filename="../test_error_handler.cpp" />
 		<Unit filename="../test_exception.cpp" />
+		<Unit filename="../test_fixed_iterator.cpp" />
 		<Unit filename="../test_fnv_1.cpp" />
 		<Unit filename="../test_forward_list.cpp" />
 		<Unit filename="../test_function.cpp" />
diff --git a/test/codeblocks/ETL.depend b/test/codeblocks/ETL.depend
index bce351d3..3958042b 100644
--- a/test/codeblocks/ETL.depend
+++ b/test/codeblocks/ETL.depend
@@ -161,7 +161,7 @@
 1414845610 u:\users\john\documents\programming\github\unittest-cpp\unittest++\reportassert.h
 	"HelperMacros.h"
 
-1418906587 source:u:\users\john\documents\programming\github\etl\test\test_array.cpp
+1423601008 source:u:\users\john\documents\programming\github\etl\test\test_array.cpp
 	<UnitTest++/UnitTest++.h>
 	"../array.h"
 	<array>
@@ -211,37 +211,37 @@
 
 1414929413 ecma.h"
 
-1420655747 u:\users\john\documents\programming\github\etl\crc8_ccitt.h
+1423387319 u:\users\john\documents\programming\github\etl\crc8_ccitt.h
 	<stdint.h>
 	"static_assert.h"
 	"type_traits.h"
 	"endian.h"
 
-1420655747 u:\users\john\documents\programming\github\etl\crc16.h
+1423387319 u:\users\john\documents\programming\github\etl\crc16.h
 	<stdint.h>
 	"static_assert.h"
 	"type_traits.h"
 	"endian.h"
 
-1420655747 u:\users\john\documents\programming\github\etl\crc16_ccitt.h
+1423387319 u:\users\john\documents\programming\github\etl\crc16_ccitt.h
 	<stdint.h>
 	"static_assert.h"
 	"type_traits.h"
 	"endian.h"
 
-1420655747 u:\users\john\documents\programming\github\etl\crc16_kermit.h
+1423387319 u:\users\john\documents\programming\github\etl\crc16_kermit.h
 	<stdint.h>
 	"static_assert.h"
 	"type_traits.h"
 	"endian.h"
 
-1420655747 u:\users\john\documents\programming\github\etl\crc32.h
+1423387319 u:\users\john\documents\programming\github\etl\crc32.h
 	<stdint.h>
 	"static_assert.h"
 	"type_traits.h"
 	"endian.h"
 
-1420655747 u:\users\john\documents\programming\github\etl\crc64_ecma.h
+1423387319 u:\users\john\documents\programming\github\etl\crc64_ecma.h
 	<stdint.h>
 	"static_assert.h"
 	"type_traits.h"
@@ -261,22 +261,29 @@
 
 1418906586 u:\users\john\documents\programming\github\etl\static_assert.h
 
-1418906587 source:u:\users\john\documents\programming\github\etl\test\test_deque.cpp
+1423601614 source:u:\users\john\documents\programming\github\etl\test\test_deque.cpp
 	<UnitTest++/UnitTest++.h>
 	"../deque.h"
 	<vector>
+	<deque>
 	<algorithm>
+	<iostream>
+	<numeric>
 
-1418906586 u:\users\john\documents\programming\github\etl\deque.h
+1422809218 u:\users\john\documents\programming\github\etl\deque.h
 	<stddef.h>
+	<stdint.h>
 	<iterator>
 	<algorithm>
 	"ideque.h"
 	"container.h"
+	"alignment.h"
+	"array.h"
 
-1419178113 u:\users\john\documents\programming\github\etl\ideque.h
+1423600800 u:\users\john\documents\programming\github\etl\ideque.h
 	<stddef.h>
 	<iterator>
+	"algorithm.h"
 	"type_traits.h"
 	"deque_base.h"
 	"parameter_type.h"
@@ -292,7 +299,7 @@
 
 1418906586 u:\users\john\documents\programming\github\etl\nullptr.h
 
-1418906586 u:\users\john\documents\programming\github\etl\deque_base.h
+1422809248 u:\users\john\documents\programming\github\etl\deque_base.h
 	<stddef.h>
 	"exception.h"
 
@@ -330,7 +337,7 @@
 1418906586 u:\users\john\documents\programming\github\etl\largest.h
 	"type_traits.h"
 
-1421601674 source:u:\users\john\documents\programming\github\etl\test\test_list.cpp
+1423387319 source:u:\users\john\documents\programming\github\etl\test\test_list.cpp
 	<UnitTest++/UnitTest++.h>
 	"ExtraCheckMacros.h"
 	"../list.h"
@@ -340,17 +347,19 @@
 	<list>
 	<vector>
 
-1421601674 source:u:\users\john\documents\programming\github\etl\test\test_map.cpp
+1423387319 source:u:\users\john\documents\programming\github\etl\test\test_map.cpp
 	<UnitTest++/UnitTest++.h>
-	"ExtraCheckMacros.h"
-	"../map.h"
-	"data.h"
-	<algorithm>
-	<array>
 	<map>
+	<array>
+	<algorithm>
+	<utility>
+	<iterator>
+	<string>
 	<vector>
+	<iostream>
+	"../map.h"
 
-1418906586 u:\users\john\documents\programming\github\etl\test\extracheckmacros.h
+1421962897 u:\users\john\documents\programming\github\etl\test\extracheckmacros.h
 	<UnitTest++/HelperMacros.h>
 	<UnitTest++/ExceptionMacros.h>
 	<UnitTest++/Checks.h>
@@ -362,19 +371,21 @@
 
 1415009648 +/ReportAssertImpl.h>
 
-1421601517 u:\users\john\documents\programming\github\etl\list.h
+1423387319 u:\users\john\documents\programming\github\etl\list.h
 	<stddef.h>
 	"ilist.h"
 	"container.h"
 	"pool.h"
 
-1421601517 u:\users\john\documents\programming\github\etl\map.h
+1423387319 u:\users\john\documents\programming\github\etl\map.h
 	<stddef.h>
+	<iterator>
+	<functional>
 	"imap.h"
 	"container.h"
 	"pool.h"
 
-1421608839 u:\users\john\documents\programming\github\etl\ilist.h
+1423387319 u:\users\john\documents\programming\github\etl\ilist.h
 	<iterator>
 	<algorithm>
 	<functional>
@@ -385,7 +396,7 @@
 	"parameter_type.h"
 	"pool.h"
 
-1421608839 u:\users\john\documents\programming\github\etl\imap.h
+1423601721 u:\users\john\documents\programming\github\etl\imap.h
 	<iterator>
 	<algorithm>
 	<functional>
@@ -395,12 +406,13 @@
 	"type_traits.h"
 	"parameter_type.h"
 	"pool.h"
+	<iostream>
 
-1421068120 u:\users\john\documents\programming\github\etl\list_base.h
+1423387319 u:\users\john\documents\programming\github\etl\list_base.h
 	<stddef.h>
 	"exception.h"
 
-1421068120 u:\users\john\documents\programming\github\etl\map_base.h
+1423387319 u:\users\john\documents\programming\github\etl\map_base.h
 	<stddef.h>
 	"exception.h"
 
@@ -435,7 +447,7 @@
 	"exception.h"
 	"error_handler.h"
 
-1419967638 u:\users\john\documents\programming\github\etl\vector.h
+1423387319 u:\users\john\documents\programming\github\etl\vector.h
 	<stddef.h>
 	<stdint.h>
 	<iterator>
@@ -444,7 +456,7 @@
 	"alignment.h"
 	"array.h"
 
-1420038059 u:\users\john\documents\programming\github\etl\ivector.h
+1423422671 u:\users\john\documents\programming\github\etl\ivector.h
 	<iterator>
 	<algorithm>
 	<functional>
@@ -456,53 +468,60 @@
 
 1415195892 se.h"
 
-1419451562 u:\users\john\documents\programming\github\etl\vector_base.h
+1423387319 u:\users\john\documents\programming\github\etl\vector_base.h
 	<stddef.h>
 	"exception.h"
 	"error_handler.h"
 
-1418906587 source:u:\users\john\documents\programming\github\etl\test\test_queue.cpp
+1423387319 source:u:\users\john\documents\programming\github\etl\test\test_queue.cpp
 	<UnitTest++/UnitTest++.h>
 	<queue>
 	"../queue.h"
 
 1415139315 h"
 
-1418906586 u:\users\john\documents\programming\github\etl\queue.h
+1423601747 u:\users\john\documents\programming\github\etl\queue.h
 	<stddef.h>
+	<stdint.h>
 	"iqueue.h"
 	"container.h"
+	"alignment.h"
+	"array.h"
 
-1419178113 u:\users\john\documents\programming\github\etl\iqueue.h
+1423387319 u:\users\john\documents\programming\github\etl\iqueue.h
 	<stddef.h>
 	"queue_base.h"
 	"type_traits.h"
 	"parameter_type.h"
 	"error_handler.h"
 
-1418906586 u:\users\john\documents\programming\github\etl\queue_base.h
+1423387319 u:\users\john\documents\programming\github\etl\queue_base.h
 	<stddef.h>
 	"exception.h"
 
-1418906587 source:u:\users\john\documents\programming\github\etl\test\test_stack.cpp
+1423387319 source:u:\users\john\documents\programming\github\etl\test\test_stack.cpp
 	<UnitTest++/UnitTest++.h>
 	<stack>
+	"data.h"
 	"../stack.h"
 
-1418906586 u:\users\john\documents\programming\github\etl\stack.h
+1423601764 u:\users\john\documents\programming\github\etl\stack.h
 	<stddef.h>
+	<stdint.h>
 	<algorithm>
 	"istack.h"
 	"container.h"
+	"alignment.h"
+	"array.h"
 
-1419178113 u:\users\john\documents\programming\github\etl\istack.h
+1423387319 u:\users\john\documents\programming\github\etl\istack.h
 	<stddef.h>
 	"stack_base.h"
 	"type_traits.h"
 	"parameter_type.h"
 	"error_handler.h"
 
-1418906586 u:\users\john\documents\programming\github\etl\stack_base.h
+1423387319 u:\users\john\documents\programming\github\etl\stack_base.h
 	<stddef.h>
 	"exception.h"
 
@@ -513,7 +532,7 @@
 
 1415196048 raits.h"
 
-1419209500 source:u:\users\john\documents\programming\github\etl\test\test_vector.cpp
+1423424055 source:u:\users\john\documents\programming\github\etl\test\test_vector.cpp
 	<UnitTest++/UnitTest++.h>
 	<vector>
 	<array>
@@ -1034,14 +1053,14 @@
 
 1415195892 /mnt/hgfs/W7 My Documents/Programming/GitHub/etl/largest.h
 
-1421591790 source:u:\users\john\documents\programming\github\etl\test\test_bitset.cpp
+1423387479 source:u:\users\john\documents\programming\github\etl\test\test_bitset.cpp
 	<UnitTest++/UnitTest++.h>
 	<limits>
 	<type_traits>
 	<bitset>
 	"../bitset.h"
 
-1421611463 u:\users\john\documents\programming\github\etl\bitset.h
+1423387479 u:\users\john\documents\programming\github\etl\bitset.h
 	<algorithm>
 	<iterator>
 	<string.h>
@@ -1063,7 +1082,7 @@
 	<stdint.h>
 	"integral_limits.h"
 
-1421610881 source:u:\users\john\documents\programming\github\etl\test\test_forward_list.cpp
+1423387319 source:u:\users\john\documents\programming\github\etl\test\test_forward_list.cpp
 	<UnitTest++/UnitTest++.h>
 	"ExtraCheckMacros.h"
 	"data.h"
@@ -1074,13 +1093,13 @@
 	<vector>
 	<string>
 
-1421610767 u:\users\john\documents\programming\github\etl\forward_list.h
+1423387319 u:\users\john\documents\programming\github\etl\forward_list.h
 	<stddef.h>
 	"pool.h"
 	"iforward_list.h"
 	"container.h"
 
-1421611168 u:\users\john\documents\programming\github\etl\iforward_list.h
+1423387319 u:\users\john\documents\programming\github\etl\iforward_list.h
 	<iterator>
 	<algorithm>
 	<functional>
@@ -1091,7 +1110,7 @@
 	"type_traits.h"
 	"parameter_type.h"
 
-1421600004 u:\users\john\documents\programming\github\etl\forward_list_base.h
+1423387319 u:\users\john\documents\programming\github\etl\forward_list_base.h
 	<stddef.h>
 	"exception.h"
 
@@ -1121,21 +1140,21 @@
 	<bitset>
 	"../integral_limits.h"
 
-1421017490 source:u:\users\john\documents\programming\github\etl\test\test_maths.cpp
+1423387319 source:u:\users\john\documents\programming\github\etl\test\test_maths.cpp
 	<UnitTest++/UnitTest++.h>
 	"../log.h"
 	"../power.h"
 	"../fibonacci.h"
 	"../factorial.h"
 
-1421608538 source:u:\users\john\documents\programming\github\etl\test\test_pool.cpp
+1423387319 source:u:\users\john\documents\programming\github\etl\test\test_pool.cpp
 	<UnitTest++/UnitTest++.h>
 	"data.h"
 	<set>
 	<vector>
 	"../pool.h"
 
-1421170175 u:\users\john\documents\programming\github\etl\pool.h
+1423601678 u:\users\john\documents\programming\github\etl\pool.h
 	"alignment.h"
 	"array.h"
 	"bitset.h"
@@ -1154,7 +1173,7 @@
 	<vector>
 	<algorithm>
 
-1419967474 u:\users\john\documents\programming\github\etl\variant.h
+1423387319 u:\users\john\documents\programming\github\etl\variant.h
 	<stdint.h>
 	"array.h"
 	"largest.h"
@@ -1165,7 +1184,7 @@
 	"alignment.h"
 	"error_handler.h"
 
-1421016981 u:\users\john\documents\programming\github\etl\power.h
+1423387319 u:\users\john\documents\programming\github\etl\power.h
 	<stddef.h>
 	"log.h"
 
@@ -1272,9 +1291,9 @@
 	"fnv_1.h"
 	"type_traits.h"
 
-1421609236 u:\users\john\documents\programming\github\etl\ibitset.h
+1423387319 u:\users\john\documents\programming\github\etl\ibitset.h
 
-1419180324 source:u:\users\john\documents\programming\github\etl\test\test_lookup.cpp
+1423387319 source:u:\users\john\documents\programming\github\etl\test\test_lookup.cpp
 	<UnitTest++/UnitTest++.h>
 	<map>
 	<array>
@@ -1285,14 +1304,14 @@
 	<vector>
 	"../lookup.h"
 
-1419179753 u:\users\john\documents\programming\github\etl\lookup.h
+1423387319 u:\users\john\documents\programming\github\etl\lookup.h
 	<stddef.h>
 	<iterator>
 	<functional>
 	"ilookup.h"
 	"vector.h"
 
-1419190414 u:\users\john\documents\programming\github\etl\ilookup.h
+1423387319 u:\users\john\documents\programming\github\etl\ilookup.h
 	<iterator>
 	<algorithm>
 	<functional>
@@ -1304,19 +1323,19 @@
 	"ivector.h"
 	"error_handler.h"
 
-1419109759 u:\users\john\documents\programming\github\etl\lookup_base.h
+1423387319 u:\users\john\documents\programming\github\etl\lookup_base.h
 	<stddef.h>
 	"exception.h"
 	"ivector.h"
 	"error_handler.h"
 
-1421611259 u:\users\john\documents\programming\github\etl\ipool.h
+1423387319 u:\users\john\documents\programming\github\etl\ipool.h
 	<iterator>
 	"pool_base.h"
 	"nullptr.h"
 	"error_handler.h"
 
-1421608508 u:\users\john\documents\programming\github\etl\pool_base.h
+1423387319 u:\users\john\documents\programming\github\etl\pool_base.h
 	<stddef.h>
 	"exception.h"
 	"error_handler.h"
@@ -1327,10 +1346,10 @@
 
 1419179259 u:\users\john\documents\programming\github\etl\singleton.h
 
-1421501221 u:\users\john\documents\programming\github\etl\test\data.h
+1423387319 u:\users\john\documents\programming\github\etl\test\data.h
 	<ostream>
 
-1421017897 source:u:\users\john\documents\programming\github\etl\test\test_bloom_filter.cpp
+1423387319 source:u:\users\john\documents\programming\github\etl\test\test_bloom_filter.cpp
 	<UnitTest++/UnitTest++.h>
 	<stdlib.h>
 	<vector>
@@ -1340,7 +1359,7 @@
 	"../crc16_ccitt.h"
 	"../crc32.h"
 
-1421613097 u:\users\john\documents\programming\github\etl\bloom_filter.h
+1423387479 u:\users\john\documents\programming\github\etl\bloom_filter.h
 	"parameter_type.h"
 	"bitset.h"
 	"type_traits.h"
diff --git a/test/codeblocks/ETL.layout b/test/codeblocks/ETL.layout
index bcdecb8b..394ef40e 100644
--- a/test/codeblocks/ETL.layout
+++ b/test/codeblocks/ETL.layout
@@ -1,76 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
 <CodeBlocks_layout_file>
 	<ActiveTarget name="Windows" />
-	<File name="..\..\..\unittest-cpp\UnitTest++\Config.h" open="0" top="0" tabpos="4" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="773" topLine="0" />
-		</Cursor>
-	</File>
-	<File name="..\..\static_assert.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="1356" topLine="10" />
-		</Cursor>
-	</File>
-	<File name="..\test_hash.cpp" open="1" top="0" tabpos="11" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="4733" topLine="114" />
-		</Cursor>
-	</File>
-	<File name="..\..\type_traits.h" open="1" top="0" tabpos="7" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="5782" topLine="136" />
-		</Cursor>
-	</File>
-	<File name="..\test_integral_limits.cpp" open="1" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="1416" topLine="13" />
-		</Cursor>
-	</File>
-	<File name="..\..\ilist.h" open="1" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="17660" topLine="539" />
-		</Cursor>
-	</File>
-	<File name="..\..\imap.h" open="1" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="17660" topLine="539" />
-		</Cursor>
-	</File>
-	<File name="..\..\ilookup.h" open="1" top="0" tabpos="14" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="10573" topLine="244" />
-		</Cursor>
-	</File>
-	<File name="..\..\..\unittest-cpp\UnitTest++\ExecuteTest.h" open="0" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="355" topLine="0" />
-		</Cursor>
-	</File>
-	<File name="..\test_lookup.cpp" open="1" top="0" tabpos="16" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="3867" topLine="101" />
-		</Cursor>
-	</File>
-	<File name="..\..\integral_limits.h" open="1" top="0" tabpos="6" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="2272" topLine="36" />
-		</Cursor>
-	</File>
-	<File name="..\main.cpp" open="0" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="277" topLine="0" />
-		</Cursor>
-	</File>
-	<File name="..\..\cyclic_value.h" open="1" top="0" tabpos="5" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="3578" topLine="85" />
-		</Cursor>
-	</File>
-	<File name="..\..\deque.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="4670" topLine="110" />
-		</Cursor>
-	</File>
 	<File name="..\..\..\unittest-cpp\UnitTest++\Win32\TimeHelpers.cpp" open="0" top="0" tabpos="9" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
 			<Cursor1 position="257" topLine="0" />
@@ -81,89 +11,14 @@
 			<Cursor1 position="616" topLine="0" />
 		</Cursor>
 	</File>
-	<File name="..\test_array.cpp" open="0" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="2123" topLine="55" />
-		</Cursor>
-	</File>
-	<File name="..\test_queue.cpp" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="1603" topLine="28" />
-		</Cursor>
-	</File>
 	<File name="..\..\..\unittest-cpp\UnitTest++\Win32\TimeHelpers.h" open="0" top="0" tabpos="5" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
 			<Cursor1 position="245" topLine="0" />
 		</Cursor>
 	</File>
-	<File name="..\..\list.h" open="0" top="0" tabpos="10" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="5955" topLine="137" />
-		</Cursor>
-	</File>
-	<File name="..\..\map.h" open="0" top="0" tabpos="10" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="5955" topLine="137" />
-		</Cursor>
-	</File>
-	<File name="..\..\endian.h" open="1" top="0" tabpos="12" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="2235" topLine="37" />
-		</Cursor>
-	</File>
-	<File name="..\test_type_traits.cpp" open="1" top="0" tabpos="9" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="34843" topLine="428" />
-		</Cursor>
-	</File>
 	<File name="..\..\lookup.h" open="1" top="0" tabpos="15" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
-			<Cursor1 position="3734" topLine="57" />
-		</Cursor>
-	</File>
-	<File name="..\test_cyclic_value.cpp" open="1" top="0" tabpos="4" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="1365" topLine="12" />
-		</Cursor>
-	</File>
-	<File name="..\..\..\unittest-cpp\UnitTest++\Test.cpp" open="0" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="200" topLine="0" />
-		</Cursor>
-	</File>
-	<File name="..\..\nullptr.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="560" topLine="78" />
-		</Cursor>
-	</File>
-	<File name="..\..\Doxyfile" open="1" top="0" tabpos="8" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="56760" topLine="1251" />
-		</Cursor>
-	</File>
-	<File name="..\test_bloom_filter.cpp" open="1" top="0" tabpos="18" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="6035" topLine="180" />
-		</Cursor>
-	</File>
-	<File name="..\..\bloom_filter.h" open="1" top="1" tabpos="19" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="2913" topLine="57" />
-		</Cursor>
-	</File>
-	<File name="..\..\observer.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="5579" topLine="130" />
-		</Cursor>
-	</File>
-	<File name="..\test_deque.cpp" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="19477" topLine="589" />
-		</Cursor>
-	</File>
-	<File name="..\..\pool.h" open="1" top="0" tabpos="17" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="2320" topLine="22" />
+			<Cursor1 position="3734" topLine="55" />
 		</Cursor>
 	</File>
 	<File name="..\..\array.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
@@ -176,9 +31,14 @@
 			<Cursor1 position="4838" topLine="145" />
 		</Cursor>
 	</File>
-	<File name="..\..\..\unittest-cpp\UnitTest++\TestMacros.h" open="1" top="0" tabpos="13" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+	<File name="..\..\map.h" open="0" top="0" tabpos="10" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
-			<Cursor1 position="1865" topLine="28" />
+			<Cursor1 position="5955" topLine="137" />
+		</Cursor>
+	</File>
+	<File name="..\..\bloom_filter.h" open="1" top="0" tabpos="19" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="3055" topLine="57" />
 		</Cursor>
 	</File>
 	<File name="..\..\function.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
@@ -191,9 +51,159 @@
 			<Cursor1 position="2523" topLine="42" />
 		</Cursor>
 	</File>
+	<File name="..\..\nullptr.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="560" topLine="78" />
+		</Cursor>
+	</File>
+	<File name="..\test_hash.cpp" open="1" top="0" tabpos="11" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="4733" topLine="114" />
+		</Cursor>
+	</File>
 	<File name="..\..\ideque.h" open="0" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
 			<Cursor1 position="39747" topLine="1281" />
 		</Cursor>
 	</File>
+	<File name="..\..\..\unittest-cpp\UnitTest++\Test.cpp" open="0" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="200" topLine="0" />
+		</Cursor>
+	</File>
+	<File name="..\..\observer.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="5579" topLine="130" />
+		</Cursor>
+	</File>
+	<File name="..\test_integral_limits.cpp" open="1" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="1416" topLine="13" />
+		</Cursor>
+	</File>
+	<File name="..\..\pool.h" open="1" top="0" tabpos="17" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="2334" topLine="35" />
+		</Cursor>
+	</File>
+	<File name="..\test_lookup.cpp" open="1" top="0" tabpos="16" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="3867" topLine="101" />
+		</Cursor>
+	</File>
+	<File name="..\..\queue.h" open="1" top="0" tabpos="21" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="2984" topLine="48" />
+		</Cursor>
+	</File>
+	<File name="..\..\..\unittest-cpp\UnitTest++\TestMacros.h" open="1" top="0" tabpos="13" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="1865" topLine="28" />
+		</Cursor>
+	</File>
+	<File name="..\..\stack.h" open="1" top="1" tabpos="22" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="3196" topLine="57" />
+		</Cursor>
+	</File>
+	<File name="..\..\static_assert.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="1356" topLine="10" />
+		</Cursor>
+	</File>
+	<File name="..\test_queue.cpp" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="1603" topLine="28" />
+		</Cursor>
+	</File>
+	<File name="..\..\ilist.h" open="1" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="17660" topLine="539" />
+		</Cursor>
+	</File>
+	<File name="..\..\type_traits.h" open="1" top="0" tabpos="7" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="5782" topLine="136" />
+		</Cursor>
+	</File>
+	<File name="..\..\cyclic_value.h" open="1" top="0" tabpos="5" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="3578" topLine="85" />
+		</Cursor>
+	</File>
+	<File name="..\..\ilookup.h" open="1" top="0" tabpos="14" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="10573" topLine="244" />
+		</Cursor>
+	</File>
+	<File name="..\..\deque.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="4670" topLine="110" />
+		</Cursor>
+	</File>
+	<File name="..\..\imap.h" open="1" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="60526" topLine="1708" />
+		</Cursor>
+	</File>
+	<File name="..\test_bloom_filter.cpp" open="1" top="0" tabpos="18" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="6035" topLine="180" />
+		</Cursor>
+	</File>
+	<File name="..\test_type_traits.cpp" open="1" top="0" tabpos="9" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="34843" topLine="428" />
+		</Cursor>
+	</File>
+	<File name="..\..\..\unittest-cpp\UnitTest++\Config.h" open="0" top="0" tabpos="4" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="773" topLine="0" />
+		</Cursor>
+	</File>
+	<File name="..\..\integral_limits.h" open="1" top="0" tabpos="6" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="2272" topLine="36" />
+		</Cursor>
+	</File>
+	<File name="..\..\endian.h" open="1" top="0" tabpos="12" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="2235" topLine="37" />
+		</Cursor>
+	</File>
+	<File name="..\..\..\unittest-cpp\UnitTest++\ExecuteTest.h" open="0" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="355" topLine="0" />
+		</Cursor>
+	</File>
+	<File name="..\main.cpp" open="0" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="277" topLine="0" />
+		</Cursor>
+	</File>
+	<File name="..\test_cyclic_value.cpp" open="1" top="0" tabpos="4" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="1365" topLine="12" />
+		</Cursor>
+	</File>
+	<File name="..\test_deque.cpp" open="1" top="0" tabpos="20" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="21475" topLine="641" />
+		</Cursor>
+	</File>
+	<File name="..\..\Doxyfile" open="1" top="0" tabpos="8" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="56760" topLine="1251" />
+		</Cursor>
+	</File>
+	<File name="..\..\list.h" open="0" top="0" tabpos="10" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="5955" topLine="137" />
+		</Cursor>
+	</File>
+	<File name="..\test_array.cpp" open="0" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="2123" topLine="55" />
+		</Cursor>
+	</File>
 </CodeBlocks_layout_file>
diff --git a/test/vs2013/etl.vcxproj b/test/vs2013/etl.vcxproj
index 4ec3f294..9865850d 100644
--- a/test/vs2013/etl.vcxproj
+++ b/test/vs2013/etl.vcxproj
@@ -73,8 +73,8 @@
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../../UnitTest++/src/</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_LIB;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;ETL_THROW_EXCEPTIONS;PLATFORM_WINDOWS;COMPILER_MICROSOFT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>../../../unittest-cpp</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -255,6 +255,8 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\Doxyfile" />
+    <None Include="ClassDiagram.cd" />
+    <None Include="ClassDiagram1.cd" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/test/vs2013/etl.vcxproj.filters b/test/vs2013/etl.vcxproj.filters
index 033c5bad..4ce122fb 100644
--- a/test/vs2013/etl.vcxproj.filters
+++ b/test/vs2013/etl.vcxproj.filters
@@ -532,5 +532,7 @@
     <None Include="..\..\Doxyfile">
       <Filter>Header Files</Filter>
     </None>
+    <None Include="ClassDiagram.cd" />
+    <None Include="ClassDiagram1.cd" />
   </ItemGroup>
 </Project>
\ No newline at end of file