diff --git a/include/etl/algorithm.h b/include/etl/algorithm.h
index 8ee795a8..7317889c 100644
--- a/include/etl/algorithm.h
+++ b/include/etl/algorithm.h
@@ -34,7 +34,7 @@ SOFTWARE.
 #define ETL_ALGORITHM_INCLUDED
 
 ///\defgroup algorithm algorithm
-/// Including reverse engineered algorithms from C++ 0x11, 0x14, 0x17
+/// Including reverse engineered algorithms from C++11, 14, 17
 /// Additional new variants of certain algorithms.
 ///\ingroup utilities
 
diff --git a/include/etl/array.h b/include/etl/array.h
index f1624209..1f2f5044 100644
--- a/include/etl/array.h
+++ b/include/etl/array.h
@@ -46,7 +46,7 @@ SOFTWARE.
 #include <stddef.h>
 
 ///\defgroup array array
-/// A replacement for std::array if you haven't got C++0x11.
+/// A replacement for std::array if you haven't got C++11.
 ///\ingroup containers
 
 namespace etl
@@ -81,7 +81,7 @@ namespace etl
 
   //***************************************************************************
   ///\ingroup array
-  /// A replacement for std::array if you haven't got C++0x11.
+  /// A replacement for std::array if you haven't got C++11.
   //***************************************************************************
   template <typename T, size_t SIZE_>
   class array
@@ -646,7 +646,7 @@ namespace etl
 
   //***************************************************************************
   ///\ingroup array
-  /// A replacement for std::array if you haven't got C++0x11.
+  /// A replacement for std::array if you haven't got C++11.
   /// Specialisation for zero sized array.
   //***************************************************************************
   template <typename T>
diff --git a/include/etl/functional.h b/include/etl/functional.h
index 3c1c55b4..e313325e 100644
--- a/include/etl/functional.h
+++ b/include/etl/functional.h
@@ -43,7 +43,7 @@ SOFTWARE.
 namespace etl
 {
   //***************************************************************************
-  /// A definition of reference_wrapper for those that don't have C++ 0x11 support.
+  /// A definition of reference_wrapper for those that don't have C++11 support.
   ///\ingroup reference
   //***************************************************************************
   template <typename T>
diff --git a/include/etl/numeric.h b/include/etl/numeric.h
index dbb43696..3283b338 100644
--- a/include/etl/numeric.h
+++ b/include/etl/numeric.h
@@ -47,7 +47,7 @@ namespace etl
 {
   //***************************************************************************
   /// iota
-  /// Reverse engineered version of std::iota for non C++ 0x11 compilers.
+  /// Reverse engineered version of std::iota for non C++11 compilers.
   /// Fills a range of elements with sequentially increasing values starting with <b>value</b>.
   ///\param first An iterator to the first position to fill.
   ///\param last  An iterator to the last + 1 position.
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 2fdfc71c..2bec7847 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -86,6 +86,7 @@ add_executable(etl_tests
 	test_closure.cpp
 	test_closure_constexpr.cpp
 	test_compare.cpp
+	test_concepts.cpp
 	test_constant.cpp
 	test_const_map.cpp
 	test_const_map_constexpr.cpp
@@ -172,6 +173,7 @@ add_executable(etl_tests
 	test_endian.cpp
 	test_enum_type.cpp
 	test_error_handler.cpp
+	test_etl_assert.cpp
 	test_etl_traits.cpp
 	test_exception.cpp
 	test_expected.cpp
@@ -183,6 +185,7 @@ add_executable(etl_tests
 	test_flat_multiset.cpp
 	test_flat_set.cpp
 	test_fnv_1.cpp
+	test_format.cpp
 	test_format_spec.cpp
 	test_forward_list.cpp
 	test_forward_list_shared_pool.cpp
@@ -194,10 +197,12 @@ add_executable(etl_tests
 	test_hash.cpp
 	test_hfsm.cpp
 	test_hfsm_recurse_to_inner_state_on_start.cpp
+	test_hfsm_transition_on_enter.cpp
 	test_histogram.cpp
 	test_index_of_type.cpp
 	test_indirect_vector.cpp
 	test_indirect_vector_external_buffer.cpp
+	test_inplace_function.cpp
 	test_instance_count.cpp
 	test_integral_limits.cpp
 	test_intrusive_forward_list.cpp
@@ -206,7 +211,9 @@ add_executable(etl_tests
 	test_intrusive_queue.cpp
 	test_intrusive_stack.cpp
 	test_invert.cpp
+	test_invoke.cpp
 	test_io_port.cpp
+	test_is_invocable.cpp
 	test_iterator.cpp
 	test_jenkins.cpp
 	test_largest.cpp
@@ -259,6 +266,7 @@ add_executable(etl_tests
 	test_pool.cpp
 	test_pool_external_buffer.cpp
 	test_priority_queue.cpp
+	test_print.cpp
 	test_pseudo_moving_average.cpp
 	test_quantize.cpp
 	test_queue.cpp
@@ -286,6 +294,7 @@ add_executable(etl_tests
 	test_scaled_rounding.cpp
 	test_set.cpp
 	test_shared_message.cpp
+	test_signal.cpp
 	test_singleton.cpp
 	test_singleton_base.cpp
 	test_smallest.cpp
diff --git a/test/test_etl_assert.cpp b/test/test_etl_assert.cpp
index e927a0b2..26fcced4 100644
--- a/test/test_etl_assert.cpp
+++ b/test/test_etl_assert.cpp
@@ -34,6 +34,8 @@ SOFTWARE.
 #include "etl/error_handler.h"
 #include "etl/exception.h"
 
+#include <cstring>
+
 namespace
 {
   class TestException1 : public etl::exception