diff --git a/lib/c/2014/test/test_labcomm_generated_encoding.c b/lib/c/2014/test/test_labcomm_generated_encoding.c
index 6b880d46c2183a424b2e6cba5147269f669adee8..5936b0a3bbfac25a06bc3298176dfcee6d9f872d 100644
--- a/lib/c/2014/test/test_labcomm_generated_encoding.c
+++ b/lib/c/2014/test/test_labcomm_generated_encoding.c
@@ -213,7 +213,7 @@ int main(void)
   /* Register twice to make sure that only one registration gets encoded */
   labcomm2014_encoder_register_generated_encoding_V(encoder);
   labcomm2014_encoder_register_generated_encoding_V(encoder);
-  EXPECT({ 0x02, 0x06, VARIABLE(0), 0x01, 'V', 0x02, 0x11, 0x00,
+  EXPECT({ 0x02, 0x07, VARIABLE(0), 0x01, 'V', 0x03, 0x00, 0x11, 0x00,
            0x04, 0x08, VARIABLE(1), 0x03, 'v', '_', 't', 0x02, 0x11, 0x00,
            0x04, 0x05, VARIABLE(2), 0x01, 'V', 0x01, VARIABLE(1),
            0x05, 0x02, VARIABLE(0), VARIABLE(2) });
@@ -222,14 +222,14 @@ int main(void)
   /* Register twice to make sure that only one registration gets encoded */
   labcomm2014_encoder_register_generated_encoding_B(encoder);
   labcomm2014_encoder_register_generated_encoding_B(encoder);
-  EXPECT({ 0x02, 0x05, VARIABLE(3), 0x01, 'B', 0x01, 0x21,
+  EXPECT({ 0x02, 0x06, VARIABLE(3), 0x01, 'B', 0x02, 0x00, 0x21,
            0x05, 0x02, VARIABLE(3), LABCOMM_BIND_SELF });
 
   labcomm2014_encoder_ioctl(encoder, IOCTL_WRITER_RESET);
   /* Register twice to make sure that only one registration gets encoded */
   labcomm2014_encoder_register_generated_encoding_R(encoder);
   labcomm2014_encoder_register_generated_encoding_R(encoder);
-  EXPECT({ 0x02, 0x08, VARIABLE(4), 0x01, 'R', 0x04, 0x10, 0x01, 0x04, 0x28,
+  EXPECT({ 0x02, 0x09, VARIABLE(4), 0x01, 'R', 0x05, 0x00,  0x10, 0x01, 0x04, 0x28,
            0x05, 0x02, VARIABLE(4), LABCOMM_BIND_SELF });
 
   labcomm2014_encoder_ioctl(encoder, IOCTL_WRITER_RESET);
@@ -238,7 +238,7 @@ int main(void)
                                       labcomm2014_signature_generated_encoding_V);
   labcomm2014_encoder_sample_ref_register(encoder, 
                                       labcomm2014_signature_generated_encoding_V);
-  EXPECT({0x03, 0x06, VARIABLE(5), 0x01, 'V', 0x02, 0x11, 0x00});
+  EXPECT({0x03, 0x07, VARIABLE(5), 0x01, 'V', 0x03, 0x00, 0x11, 0x00});
 
   labcomm2014_encoder_ioctl(encoder, IOCTL_WRITER_RESET);
   /* Register twice to make sure that only one registration gets encoded */
@@ -246,7 +246,7 @@ int main(void)
                                       labcomm2014_signature_generated_encoding_B);
   labcomm2014_encoder_sample_ref_register(encoder, 
                                       labcomm2014_signature_generated_encoding_B);
-  EXPECT({0x03, 0x05, VARIABLE(6), 0x01, 'B', 0x01, 0x21});
+  EXPECT({0x03, 0x06, VARIABLE(6), 0x01, 'B', 0x02, 0x00, 0x21});
 
   labcomm2014_encoder_ioctl(encoder, IOCTL_WRITER_RESET);
   /* Register twice to make sure that only one registration gets encoded */
@@ -254,7 +254,7 @@ int main(void)
                                       labcomm2014_signature_generated_encoding_R);
   labcomm2014_encoder_sample_ref_register(encoder, 
                                       labcomm2014_signature_generated_encoding_R);
-  EXPECT({0x03, 0x08, VARIABLE(7), 0x01, 'R', 0x04, 0x10, 0x01, 0x04, 0x28});
+  EXPECT({0x03, 0x09, VARIABLE(7), 0x01, 'R', 0x05, 0x00, 0x10, 0x01, 0x04, 0x28});
 
   labcomm2014_encoder_ioctl(encoder, IOCTL_WRITER_RESET);
   // was: labcomm2014_encode_generated_encoding_V(encoder, &V);