IMPORTANT / Attempt to fix OutOfMemory error in tests (Christophe, could
you please check this ???)