#define BOOST_TEST_MAIN
 #define BOOST_TEST_DYN_LINK
 
-
 #include <streambuf>
 
 #include <boost/test/unit_test.hpp>
     uint8_t numbers[] = {
             0xC0, 0xC1, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7, 0xC8, 0xC9
     };
+    std::size_t numbers_count = sizeof(numbers);
 
     std::basic_stringbuf<uint8_t> sb;
-    sb.pubsetbuf( numbers, 10 );
+    sb.pubsetbuf( numbers, numbers_count );
     std::basic_istream<uint8_t> is( &sb );
 
-    MessagePayload mp = create_message_payload( 10 );
+    MessagePayload mp = create_message_payload( numbers_count );
     mp.read( reinterpret_cast<std::istream&>(is) );
 
     BOOST_CHECK_EQUAL( mp[0], 0xC0 );
     uint8_t numbers[ 10 ];
     std::fill( numbers, numbers + 9, 0 );
 
+    std::size_t numbers_count = sizeof(numbers);
+
     std::basic_stringbuf<uint8_t> sb;
-    sb.pubsetbuf( numbers, 10 );
+    sb.pubsetbuf( numbers, numbers_count );
     std::basic_ostream<uint8_t> os( &sb );
 
-    MessagePayload mp = create_message_payload( 10 );
-    fill_message_payload( 10, 0xC0, mp );
+    MessagePayload mp = create_message_payload( numbers_count );
+    fill_message_payload( numbers_count, 0xC0, mp );
     mp.write( reinterpret_cast<std::ostream&>(os) );
     os.flush();