diff --git a/src/cmd_decode_file.c b/src/cmd_decode_file.c
index 88a3bf0..05c2e6e 100644
--- a/src/cmd_decode_file.c
+++ b/src/cmd_decode_file.c
@@ -47,6 +47,7 @@
 #include <string.h>
 #include <assert.h>
 #include <time.h>
+#include <mem_alloc.h>
 #include <options.h>
 #include <misc.h>
 #include <epsilon.h>
diff --git a/src/cmd_encode_file.c b/src/cmd_encode_file.c
index d9ddf6b..bc82821 100644
--- a/src/cmd_encode_file.c
+++ b/src/cmd_encode_file.c
@@ -47,6 +47,7 @@
 #include <string.h>
 #include <assert.h>
 #include <time.h>
+#include <mem_alloc.h>
 #include <options.h>
 #include <misc.h>
 #include <epsilon.h>
diff --git a/src/cmd_start_node.c b/src/cmd_start_node.c
index 0d201d3..8d71285 100644
--- a/src/cmd_start_node.c
+++ b/src/cmd_start_node.c
@@ -48,6 +48,7 @@
 #include <assert.h>
 #include <errno.h>
 #include <epsilon.h>
+#include <mem_alloc.h>
 #include <options.h>
 #include <misc.h>
 
@@ -418,11 +419,11 @@ static void action_encode_gs(int sock_fd, char *ip_addr, int port)
     filter[filter_len] = 0;
 
     /* Allocate memory (it will be released implicitly at exit) */
-    Y0 = (unsigned char *) xmalloc(block_size * block_size,
+    Y0 = (unsigned char *) xmalloc(block_size * block_size *
         sizeof(unsigned char));
     Y = (unsigned char **) eps_malloc_2D(block_size, block_size,
         sizeof(unsigned char));
-    buf = (unsigned char *) xmalloc(bytes_per_block,
+    buf = (unsigned char *) xmalloc(bytes_per_block *
         sizeof(unsigned char));
 
     /* Process all incoming blocks */
@@ -526,7 +527,7 @@ static void action_encode_tc(int sock_fd, char *ip_addr, int port)
     RECV_VALUE_FROM_MASTER(&Cr_ratio);
 
     /* Allocate memory (it will be released implicitly at exit) */
-    Y0 = (unsigned char *) xmalloc(block_size * block_size,
+    Y0 = (unsigned char *) xmalloc(block_size * block_size *
         sizeof(unsigned char));
     R = (unsigned char **) eps_malloc_2D(block_size, block_size,
         sizeof(unsigned char));
@@ -534,7 +535,7 @@ static void action_encode_tc(int sock_fd, char *ip_addr, int port)
         sizeof(unsigned char));
     B = (unsigned char **) eps_malloc_2D(block_size, block_size,
         sizeof(unsigned char));
-    buf = (unsigned char *) xmalloc(bytes_per_block,
+    buf = (unsigned char *) xmalloc(bytes_per_block *
         sizeof(unsigned char));
 
     /* Process all incoming blocks */
@@ -628,11 +629,11 @@ static void action_decode_gs(int sock_fd, char *ip_addr, int port)
     RECV_VALUE_FROM_MASTER(&block_size);
 
     /* Allocate memory (it will be released implicitly at exit) */
-    Y0 = (unsigned char *) xmalloc(block_size * block_size,
+    Y0 = (unsigned char *) xmalloc(block_size * block_size *
         sizeof(unsigned char));
     Y = (unsigned char **) eps_malloc_2D(block_size, block_size,
         sizeof(unsigned char));
-    buf = (unsigned char *) xmalloc(buf_size,
+    buf = (unsigned char *) xmalloc(buf_size *
         sizeof(unsigned char));
 
     /* Process all incoming blocks */
@@ -707,7 +708,7 @@ static void action_decode_tc(int sock_fd, char *ip_addr, int port)
     RECV_VALUE_FROM_MASTER(&block_size);
 
     /* Allocate memory (it will be released implicitly at exit) */
-    Y0 = (unsigned char *) xmalloc(block_size * block_size,
+    Y0 = (unsigned char *) xmalloc(block_size * block_size *
         sizeof(unsigned char));
     R = (unsigned char **) eps_malloc_2D(block_size, block_size,
         sizeof(unsigned char));
@@ -715,7 +716,7 @@ static void action_decode_tc(int sock_fd, char *ip_addr, int port)
         sizeof(unsigned char));
     B = (unsigned char **) eps_malloc_2D(block_size, block_size,
         sizeof(unsigned char));
-    buf = (unsigned char *) xmalloc(buf_size,
+    buf = (unsigned char *) xmalloc(buf_size *
         sizeof(unsigned char));
 
     /* Process all incoming blocks */
diff --git a/src/worker_mpi_node.c b/src/worker_mpi_node.c
index 1f3c040..13e0217 100644
--- a/src/worker_mpi_node.c
+++ b/src/worker_mpi_node.c
@@ -31,6 +31,7 @@
 #include <mpi.h>
 #include <worker_mpi_node.h>
 #include <epsilon.h>
+#include <mem_alloc.h>
 #include <misc.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/tests/images/Makefile.am b/tests/images/Makefile.am
index ae1855d..093e49e 100644
--- a/tests/images/Makefile.am
+++ b/tests/images/Makefile.am
@@ -1,3 +1,3 @@
 INCLUDES =
 METASOURCES = AUTO
-dist_noinst_DATA = lena.pgm nirvana.ppm gray_dot.pgm horizontal_rainbow.ppm horizontal_gradient.pgm red_dot.ppm vertical_gradient.pgm vertical_rainbow.ppm
+dist_noinst_DATA = nirvana.ppm gray_dot.pgm horizontal_rainbow.ppm horizontal_gradient.pgm red_dot.ppm vertical_gradient.pgm vertical_rainbow.ppm
diff --git a/tests/images/Makefile.in b/tests/images/Makefile.in
index 4c85442..0a5c816 100644
--- a/tests/images/Makefile.in
+++ b/tests/images/Makefile.in
@@ -159,7 +159,7 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 INCLUDES = 
 METASOURCES = AUTO
-dist_noinst_DATA = lena.pgm nirvana.ppm gray_dot.pgm horizontal_rainbow.ppm horizontal_gradient.pgm red_dot.ppm vertical_gradient.pgm vertical_rainbow.ppm
+dist_noinst_DATA = nirvana.ppm gray_dot.pgm horizontal_rainbow.ppm horizontal_gradient.pgm red_dot.ppm vertical_gradient.pgm vertical_rainbow.ppm
 all: all-am
 
 .SUFFIXES:
diff --git a/tests/t/quick.t b/tests/t/quick.t
index c556369..ad5e2ab 100644
--- a/tests/t/quick.t
+++ b/tests/t/quick.t
@@ -79,7 +79,6 @@ Readonly my %TEST_IMAGES      => (
         min_Cb_psnr => 31.50,
         min_Cr_psnr => 40.10,
     },
-    'lena.pgm'    => 53.20,
     'nirvana.ppm' => {
         min_Y_psnr  => 55.20,
         min_Cb_psnr => 44.50,
diff --git a/tests/t/verification.t b/tests/t/verification.t
index 771c25d..511d95b 100644
--- a/tests/t/verification.t
+++ b/tests/t/verification.t
@@ -76,8 +76,6 @@ Readonly my $MPI_MACHINE_FILE =>
     catfile( $Bin, q{..}, 'build', 'machines.MPICH' );
 
 Readonly my %TEST_IMAGES => (
-    'lena.pgm' => 53,
-
     'nirvana.ppm' => {
         min_Y_psnr  => 50,
         min_Cb_psnr => 44,