diff --git a/tests/unit/testempty1.c b/tests/unit/testempty1.c
index fc961c22..de29f3aa 100644
--- a/tests/unit/testempty1.c
+++ b/tests/unit/testempty1.c
@@ -36,102 +36,102 @@ void error_callback(const char *msg, void *v);
 void warning_callback(const char *msg, void *v);
 void info_callback(const char *msg, void *v);
 
-void error_callback(const char *msg, void *v) {
-(void)msg;
-(void)v;
-puts(msg);
+void error_callback(const char *msg, void *v)
+{
+    (void)msg;
+    (void)v;
+    puts(msg);
 }
-void warning_callback(const char *msg, void *v) {
-(void)msg;
-(void)v;
-puts(msg);
+void warning_callback(const char *msg, void *v)
+{
+    (void)msg;
+    (void)v;
+    puts(msg);
 }
-void info_callback(const char *msg, void *v) {
-(void)msg;
-(void)v;
-puts(msg);
+void info_callback(const char *msg, void *v)
+{
+    (void)msg;
+    (void)v;
+    puts(msg);
 }
 
 int main(int argc, char *argv[])
 {
-  const char * v = opj_version();
+    const char * v = opj_version();
 
-  const OPJ_COLOR_SPACE color_space = OPJ_CLRSPC_GRAY;
-  unsigned int numcomps = 1;
-  unsigned int i;
-  unsigned int image_width = 256;
-  unsigned int image_height = 256;
+    const OPJ_COLOR_SPACE color_space = OPJ_CLRSPC_GRAY;
+    unsigned int numcomps = 1;
+    unsigned int i;
+    unsigned int image_width = 256;
+    unsigned int image_height = 256;
 
-  opj_cparameters_t parameters;
+    opj_cparameters_t parameters;
 
-  unsigned int subsampling_dx = 0;
-  unsigned int subsampling_dy = 0;
+    unsigned int subsampling_dx = 0;
+    unsigned int subsampling_dy = 0;
 
-  opj_image_cmptparm_t cmptparm;
-  opj_image_t *image;
-  opj_codec_t* l_codec = 00;
-  OPJ_BOOL bSuccess;
-	opj_stream_t *l_stream = 00;
-  (void)argc;
-  (void)argv;
+    opj_image_cmptparm_t cmptparm;
+    opj_image_t *image;
+    opj_codec_t* l_codec = 00;
+    OPJ_BOOL bSuccess;
+    opj_stream_t *l_stream = 00;
+    (void)argc;
+    (void)argv;
 
-  opj_set_default_encoder_parameters(&parameters);
-  parameters.cod_format = J2K_CFMT;
-  puts(v);
-  cmptparm.prec = 8;
-  cmptparm.bpp = 8;
-  cmptparm.sgnd = 0;
-  cmptparm.dx = subsampling_dx;
-  cmptparm.dy = subsampling_dy;
-  cmptparm.w = image_width;
-  cmptparm.h = image_height;
+    opj_set_default_encoder_parameters(&parameters);
+    parameters.cod_format = J2K_CFMT;
+    puts(v);
+    cmptparm.prec = 8;
+    cmptparm.bpp = 8;
+    cmptparm.sgnd = 0;
+    cmptparm.dx = subsampling_dx;
+    cmptparm.dy = subsampling_dy;
+    cmptparm.w = image_width;
+    cmptparm.h = image_height;
 
-  image = opj_image_create(numcomps, &cmptparm, color_space);
-  assert( image );
+    image = opj_image_create(numcomps, &cmptparm, color_space);
+    assert(image);
 
-  for (i = 0; i < image_width * image_height; i++)
-    {
-    unsigned int compno;
-    for(compno = 0; compno < numcomps; compno++)
-      {
-      image->comps[compno].data[i] = 0;
-      }
+    for (i = 0; i < image_width * image_height; i++) {
+        unsigned int compno;
+        for (compno = 0; compno < numcomps; compno++) {
+            image->comps[compno].data[i] = 0;
+        }
     }
 
-  /* catch events using our callbacks and give a local context */
-  opj_set_info_handler(l_codec, info_callback,00);
-  opj_set_warning_handler(l_codec, warning_callback,00);
-  opj_set_error_handler(l_codec, error_callback,00);
+    /* catch events using our callbacks and give a local context */
+    opj_set_info_handler(l_codec, info_callback, 00);
+    opj_set_warning_handler(l_codec, warning_callback, 00);
+    opj_set_error_handler(l_codec, error_callback, 00);
 
-  l_codec = opj_create_compress(OPJ_CODEC_J2K);
-  opj_set_info_handler(l_codec, info_callback,00);
-  opj_set_warning_handler(l_codec, warning_callback,00);
-  opj_set_error_handler(l_codec, error_callback,00);
+    l_codec = opj_create_compress(OPJ_CODEC_J2K);
+    opj_set_info_handler(l_codec, info_callback, 00);
+    opj_set_warning_handler(l_codec, warning_callback, 00);
+    opj_set_error_handler(l_codec, error_callback, 00);
 
-  opj_setup_encoder(l_codec, &parameters, image);
+    opj_setup_encoder(l_codec, &parameters, image);
+
+    l_stream = opj_stream_create_default_file_stream("testempty1.j2k", OPJ_FALSE);
+    assert(l_stream);
+    bSuccess = opj_start_compress(l_codec, image, l_stream);
+    if (!bSuccess) {
+        opj_stream_destroy(l_stream);
+        opj_destroy_codec(l_codec);
+        opj_image_destroy(image);
+        return 0;
+    }
+
+    assert(bSuccess);
+    bSuccess = opj_encode(l_codec, l_stream);
+    assert(bSuccess);
+    bSuccess = opj_end_compress(l_codec, l_stream);
+    assert(bSuccess);
 
-  l_stream = opj_stream_create_default_file_stream("testempty1.j2k",OPJ_FALSE);
-  assert(l_stream);
-  bSuccess = opj_start_compress(l_codec,image,l_stream);
-  if( !bSuccess )
-    {
     opj_stream_destroy(l_stream);
+
     opj_destroy_codec(l_codec);
     opj_image_destroy(image);
+
+    puts("end");
     return 0;
-    }
-
-  assert( bSuccess );
-  bSuccess = opj_encode(l_codec, l_stream);
-  assert( bSuccess );
-  bSuccess = opj_end_compress(l_codec, l_stream);
-  assert( bSuccess );
-
-  opj_stream_destroy(l_stream);
-
-  opj_destroy_codec(l_codec);
-  opj_image_destroy(image);
-
-  puts( "end" );
-  return 0;
 }
diff --git a/tests/unit/testempty2.c b/tests/unit/testempty2.c
index 6b395480..339a9288 100644
--- a/tests/unit/testempty2.c
+++ b/tests/unit/testempty2.c
@@ -37,147 +37,146 @@ void error_callback(const char *msg, void *v);
 void warning_callback(const char *msg, void *v);
 void info_callback(const char *msg, void *v);
 
-void error_callback(const char *msg, void *v) {
-(void)msg;
-(void)v;
-puts(msg);
+void error_callback(const char *msg, void *v)
+{
+    (void)msg;
+    (void)v;
+    puts(msg);
 }
-void warning_callback(const char *msg, void *v) {
-(void)msg;
-(void)v;
-puts(msg);
+void warning_callback(const char *msg, void *v)
+{
+    (void)msg;
+    (void)v;
+    puts(msg);
 }
-void info_callback(const char *msg, void *v) {
-(void)msg;
-(void)v;
-puts(msg);
+void info_callback(const char *msg, void *v)
+{
+    (void)msg;
+    (void)v;
+    puts(msg);
 }
 
 int main(int argc, char *argv[])
 {
-  const char * v = opj_version();
+    const char * v = opj_version();
 
-  const OPJ_COLOR_SPACE color_space = OPJ_CLRSPC_GRAY;
-  unsigned int numcomps = 1;
-  unsigned int i;
-  unsigned int image_width = 256;
-  unsigned int image_height = 256;
+    const OPJ_COLOR_SPACE color_space = OPJ_CLRSPC_GRAY;
+    unsigned int numcomps = 1;
+    unsigned int i;
+    unsigned int image_width = 256;
+    unsigned int image_height = 256;
 
-  opj_cparameters_t parameters;
+    opj_cparameters_t parameters;
 
-  unsigned int subsampling_dx;
-  unsigned int subsampling_dy;
-  const char outputfile[] = "testempty2.j2k";
+    unsigned int subsampling_dx;
+    unsigned int subsampling_dy;
+    const char outputfile[] = "testempty2.j2k";
 
-  opj_image_cmptparm_t cmptparm;
-  opj_image_t *image;
-  opj_codec_t* l_codec = 00;
-  OPJ_BOOL bSuccess;
-  opj_stream_t *l_stream = 00;
-  (void)argc;
-  (void)argv;
+    opj_image_cmptparm_t cmptparm;
+    opj_image_t *image;
+    opj_codec_t* l_codec = 00;
+    OPJ_BOOL bSuccess;
+    opj_stream_t *l_stream = 00;
+    (void)argc;
+    (void)argv;
 
-  opj_set_default_encoder_parameters(&parameters);
-  parameters.cod_format = J2K_CFMT;
-  puts(v);
-  subsampling_dx = (unsigned int)parameters.subsampling_dx;
-  subsampling_dy = (unsigned int)parameters.subsampling_dy;
-  cmptparm.prec = 8;
-  cmptparm.bpp = 8;
-  cmptparm.sgnd = 0;
-  cmptparm.dx = subsampling_dx;
-  cmptparm.dy = subsampling_dy;
-  cmptparm.w = image_width;
-  cmptparm.h = image_height;
-  strncpy(parameters.outfile, outputfile, sizeof(parameters.outfile)-1);
+    opj_set_default_encoder_parameters(&parameters);
+    parameters.cod_format = J2K_CFMT;
+    puts(v);
+    subsampling_dx = (unsigned int)parameters.subsampling_dx;
+    subsampling_dy = (unsigned int)parameters.subsampling_dy;
+    cmptparm.prec = 8;
+    cmptparm.bpp = 8;
+    cmptparm.sgnd = 0;
+    cmptparm.dx = subsampling_dx;
+    cmptparm.dy = subsampling_dy;
+    cmptparm.w = image_width;
+    cmptparm.h = image_height;
+    strncpy(parameters.outfile, outputfile, sizeof(parameters.outfile) - 1);
 
-  image = opj_image_create(numcomps, &cmptparm, color_space);
-  assert( image );
+    image = opj_image_create(numcomps, &cmptparm, color_space);
+    assert(image);
 
-  for (i = 0; i < image_width * image_height; i++)
-    {
-    unsigned int compno;
-    for(compno = 0; compno < numcomps; compno++)
-      {
-      image->comps[compno].data[i] = 0;
-      }
+    for (i = 0; i < image_width * image_height; i++) {
+        unsigned int compno;
+        for (compno = 0; compno < numcomps; compno++) {
+            image->comps[compno].data[i] = 0;
+        }
     }
 
-  /* catch events using our callbacks and give a local context */
-  opj_set_info_handler(l_codec, info_callback,00);
-  opj_set_warning_handler(l_codec, warning_callback,00);
-  opj_set_error_handler(l_codec, error_callback,00);
+    /* catch events using our callbacks and give a local context */
+    opj_set_info_handler(l_codec, info_callback, 00);
+    opj_set_warning_handler(l_codec, warning_callback, 00);
+    opj_set_error_handler(l_codec, error_callback, 00);
 
-  l_codec = opj_create_compress(OPJ_CODEC_J2K);
-  opj_set_info_handler(l_codec, info_callback,00);
-  opj_set_warning_handler(l_codec, warning_callback,00);
-  opj_set_error_handler(l_codec, error_callback,00);
+    l_codec = opj_create_compress(OPJ_CODEC_J2K);
+    opj_set_info_handler(l_codec, info_callback, 00);
+    opj_set_warning_handler(l_codec, warning_callback, 00);
+    opj_set_error_handler(l_codec, error_callback, 00);
 
-  opj_setup_encoder(l_codec, &parameters, image);
+    opj_setup_encoder(l_codec, &parameters, image);
 
-  l_stream = opj_stream_create_default_file_stream(parameters.outfile,OPJ_FALSE);
-  if( !l_stream )
-    {
-    fprintf( stderr, "Something went wrong during creation of stream\n" );
-    opj_destroy_codec(l_codec);
-    opj_image_destroy(image);
-    opj_stream_destroy(l_stream);
-    return 1;
+    l_stream = opj_stream_create_default_file_stream(parameters.outfile, OPJ_FALSE);
+    if (!l_stream) {
+        fprintf(stderr, "Something went wrong during creation of stream\n");
+        opj_destroy_codec(l_codec);
+        opj_image_destroy(image);
+        opj_stream_destroy(l_stream);
+        return 1;
     }
-  assert(l_stream);
-  bSuccess = opj_start_compress(l_codec,image,l_stream);
-  if( !bSuccess )
-    {
+    assert(l_stream);
+    bSuccess = opj_start_compress(l_codec, image, l_stream);
+    if (!bSuccess) {
+        opj_stream_destroy(l_stream);
+        opj_destroy_codec(l_codec);
+        opj_image_destroy(image);
+        return 0;
+    }
+
+    assert(bSuccess);
+    bSuccess = opj_encode(l_codec, l_stream);
+    assert(bSuccess);
+    bSuccess = opj_end_compress(l_codec, l_stream);
+    assert(bSuccess);
+
     opj_stream_destroy(l_stream);
+
     opj_destroy_codec(l_codec);
     opj_image_destroy(image);
+
+
+    /* read back the generated file */
+    {
+        opj_codec_t* d_codec = 00;
+        opj_dparameters_t dparameters;
+
+        d_codec = opj_create_decompress(OPJ_CODEC_J2K);
+        opj_set_info_handler(d_codec, info_callback, 00);
+        opj_set_warning_handler(d_codec, warning_callback, 00);
+        opj_set_error_handler(d_codec, error_callback, 00);
+
+        bSuccess = opj_setup_decoder(d_codec, &dparameters);
+        assert(bSuccess);
+
+        l_stream = opj_stream_create_default_file_stream(outputfile, 1);
+        assert(l_stream);
+
+        bSuccess = opj_read_header(l_stream, d_codec, &image);
+        assert(bSuccess);
+
+        bSuccess = opj_decode(l_codec, l_stream, image);
+        assert(bSuccess);
+
+        bSuccess = opj_end_decompress(l_codec, l_stream);
+        assert(bSuccess);
+
+        opj_stream_destroy(l_stream);
+
+        opj_destroy_codec(d_codec);
+
+        opj_image_destroy(image);
+    }
+
+    puts("end");
     return 0;
-    }
-
-  assert( bSuccess );
-  bSuccess = opj_encode(l_codec, l_stream);
-  assert( bSuccess );
-  bSuccess = opj_end_compress(l_codec, l_stream);
-  assert( bSuccess );
-
-  opj_stream_destroy(l_stream);
-
-  opj_destroy_codec(l_codec);
-  opj_image_destroy(image);
-
-
-  /* read back the generated file */
-{
-  opj_codec_t* d_codec = 00;
-  opj_dparameters_t dparameters;
-
-  d_codec = opj_create_decompress(OPJ_CODEC_J2K);
-  opj_set_info_handler(d_codec, info_callback,00);
-  opj_set_warning_handler(d_codec, warning_callback,00);
-  opj_set_error_handler(d_codec, error_callback,00);
-
-  bSuccess = opj_setup_decoder(d_codec, &dparameters);
-  assert( bSuccess );
-
-  l_stream = opj_stream_create_default_file_stream(outputfile,1);
-  assert( l_stream );
-
-  bSuccess = opj_read_header(l_stream, d_codec, &image);
-  assert( bSuccess );
-
-  bSuccess = opj_decode(l_codec, l_stream, image);
-  assert( bSuccess );
-
-  bSuccess = opj_end_decompress(l_codec, l_stream);
-  assert( bSuccess );
-
-  opj_stream_destroy(l_stream);
-
-  opj_destroy_codec(d_codec);
-
-  opj_image_destroy(image);
-}
-
-  puts( "end" );
-  return 0;
 }