From 7ff962e8b5b8a5169ace182d2b72697b386e08a2 Mon Sep 17 00:00:00 2001
From: tbeu <tbeu@users.noreply.github.com>
Date: Wed, 23 Oct 2024 18:03:00 +0200
Subject: [PATCH] Add CTest testsuite

---
 .github/workflows/cmake.yml                   |  51 +----
 .gitignore                                    |  21 ++
 README                                        |   7 +-
 README.md                                     |   6 +-
 cmake/options.cmake                           |   8 +
 cmake/test.cmake                              |  52 +++--
 test/Makefile.am                              |   2 +-
 test/convert_at_to_ctest.py                   | 198 +++++++++++++++++
 test/test_mat.c                               |  16 +-
 test/tests/cell_api.at                        |   4 +-
 test/tests/mat4_readwrite.at                  |  24 +-
 test/tests/mat5_compressed_extended_sparse.at |   4 +-
 test/tests/mat5_compressed_read_be.at         |   8 +-
 test/tests/mat5_compressed_read_le.at         |   8 +-
 test/tests/mat5_compressed_readslab_be.at     |  40 ++--
 test/tests/mat5_compressed_readslab_le.at     |  40 ++--
 test/tests/mat5_compressed_readwrite.at       | 210 +++++++++---------
 .../mat5_uncompressed_extended_sparse.at      |   4 +-
 test/tests/mat5_uncompressed_readwrite.at     | 202 ++++++++---------
 .../tests/mat73_compressed_extended_sparse.at |   4 +-
 test/tests/mat73_compressed_readwrite.at      | 202 ++++++++---------
 .../mat73_uncompressed_extended_sparse.at     |   4 +-
 test/tests/mat73_uncompressed_read_le.at      |  14 --
 test/tests/mat73_uncompressed_readwrite.at    | 202 ++++++++---------
 tools/matdump.c                               |  25 ++-
 25 files changed, 793 insertions(+), 563 deletions(-)
 create mode 100644 test/convert_at_to_ctest.py

diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
index b6107539..245bfadf 100644
--- a/.github/workflows/cmake.yml
+++ b/.github/workflows/cmake.yml
@@ -43,6 +43,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 5
+          submodules: recursive
       - name: Setup python environment
         uses: actions/setup-python@v5
         with:
@@ -59,13 +60,13 @@ jobs:
             echo "/Users/runner/Library/Python/${{ matrix.python-version }}/bin" >> $GITHUB_PATH
           fi
           if [ "${{ matrix.compiler }}" == "msvc" ]; then
-            cmake -S . -B build -DMATIO_USE_CONAN=ON -DMATIO_SHARED=OFF
+            cmake -S . -B build -DMATIO_USE_CONAN=ON -DMATIO_SHARED=OFF -DBUILD_TESTING=ON
           elif [ "${{ matrix.compiler }}" == "mingw" ]; then
-            cmake -S . -B build -DCMAKE_BUILD_TYPE=${{ matrix.configuration }} -DMATIO_USE_CONAN=ON -DMATIO_SHARED=OFF -DMATIO_ENABLE_CPPCHECK=ON -G "MinGW Makefiles"
+            cmake -S . -B build -DCMAKE_BUILD_TYPE=${{ matrix.configuration }} -DMATIO_USE_CONAN=ON -DMATIO_SHARED=OFF -DBUILD_TESTING=ON -DMATIO_ENABLE_CPPCHECK=ON -G "MinGW Makefiles"
           elif [ "${{ matrix.compiler }}" == "gcc" ]; then
-            cmake -S . -B build -DCMAKE_BUILD_TYPE=${{ matrix.configuration }} -DMATIO_USE_CONAN=ON -DMATIO_SHARED=OFF -DMATIO_ENABLE_CPPCHECK=ON
+            cmake -S . -B build -DCMAKE_BUILD_TYPE=${{ matrix.configuration }} -DMATIO_USE_CONAN=ON -DMATIO_SHARED=OFF -DBUILD_TESTING=ON -DMATIO_ENABLE_CPPCHECK=ON
           else
-            cmake -S . -B build -DCMAKE_BUILD_TYPE=${{ matrix.configuration }} -DMATIO_USE_CONAN=ON -DMATIO_SHARED=OFF
+            cmake -S . -B build -DCMAKE_BUILD_TYPE=${{ matrix.configuration }} -DMATIO_USE_CONAN=ON -DMATIO_SHARED=OFF -DBUILD_TESTING=ON
           fi
       - name: Build with ${{ matrix.compiler }}
         run: |
@@ -75,19 +76,7 @@ jobs:
             cmake --build build -- -j8
           fi
       - name: Test
-        run: |
-          if [ "${{ matrix.compiler }}" == "msvc" ]; then
-            MATDUMP="./build/Release/matdump.exe"
-          else
-            MATDUMP="./build/bin/matdump"
-          fi
-          for file in ./share/*.mat; do
-            "$MATDUMP" -d "$file" d
-            "$MATDUMP" -v "$file"
-            "$MATDUMP" -v -f whos "$file"
-          done
-          "$MATDUMP" -v -H
-          "$MATDUMP" -V
+        run: ctest --no-tests=error --test-dir build --build-config ${{ matrix.configuration }}
 
   build-openbsd:
     name: openbsd-clang
@@ -97,6 +86,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 5
+          submodules: recursive
       - name: Test with clang
         uses: vmactions/openbsd-vm@v1
         with:
@@ -107,17 +97,9 @@ jobs:
             pkg_add cmake
           run: |
             set -e
-            cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DMATIO_SHARED=OFF -DMATIO_MAT73=OFF
+            cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DMATIO_SHARED=OFF -DMATIO_MAT73=OFF -DBUILD_TESTING=ON
             cmake --build build -- -j8
-            ./build/test_snprintf
-            ./build/test_mat -H
-            ./build/test_mat -L
-            ./build/test_mat -V
-            ./build/matdump -v -H
-            ./build/matdump -V
-            ./build/matdump -d ./share/test_file.mat structure
-            ./build/matdump -v ./share/test_file.mat
-            ./build/matdump -v -f whos ./share/test_file.mat
+            ctest --no-tests=error --test-dir build --build-config Release
 
   build-solaris:
     name: solaris-gcc
@@ -127,6 +109,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 5
+          submodules: recursive
       - name: Test with gcc
         uses: vmactions/solaris-vm@v1
         with:
@@ -139,17 +122,9 @@ jobs:
           run: |
             set -e
             mkdir build
-            cmake -S . -Bbuild -DCMAKE_BUILD_TYPE=Release -DMATIO_SHARED=OFF -DMATIO_MAT73=OFF
+            cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DMATIO_SHARED=OFF -DMATIO_MAT73=OFF -DBUILD_TESTING=ON
             cmake --build build -- -j8
-            ./build/test_snprintf
-            ./build/test_mat -H
-            ./build/test_mat -L
-            ./build/test_mat -V
-            ./build/matdump -v -H
-            ./build/matdump -V
-            ./build/matdump -d ./share/test_file.mat structure
-            ./build/matdump -v ./share/test_file.mat
-            ./build/matdump -v -f whos ./share/test_file.mat
+            ctest --no-tests=error --test-dir build --build-config Release
 
   build-cygwin:
     name: windows-cygwin
@@ -177,8 +152,6 @@ jobs:
           export PATH=/usr/bin:$PATH
           cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -G Ninja
         shell: C:\cygwin\bin\bash.exe -eo pipefail -o igncr '{0}'
-        env:
-          CYGWIN_NOWINPATH: 1
       - name: Build with gcc
         run: |
           export PATH=/usr/bin:$PATH
diff --git a/.gitignore b/.gitignore
index 74bcfa9b..6b579c5b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -210,3 +210,24 @@ FakesAssemblies/
 # Python virtual environment
 #
 .venv
+
+#
+# CMake related files
+
+ctests
+build
+out
+*_output.txt
+*.mat
+CMakeLists.txt.user
+CMakeCache.txt
+CMakeFiles
+CMakeScripts
+Testing
+Makefile
+cmake_install.cmake
+install_manifest.txt
+compile_commands.json
+CTestTestfile.cmake
+_deps
+CMakeUserPresets.json
diff --git a/README b/README
index 84c211a7..73181159 100644
--- a/README
+++ b/README
@@ -163,11 +163,14 @@ Table of Contents
         2.3.3. CMake build system
             The CMake build system is supported as an alternative build system,
             which usually consists of three steps for configuration, build and
-            installation, for example,
+            installation. By default, the CMake project is also configured for
+            testing with CTest. For example,
+
                 $ tar zxf matio-X.Y.Z.tar.gz
                 $ cd matio-X.Y.Z
                 $ cmake .
                 $ cmake --build .
+                $ ctest --test-dir .
                 $ cmake --install .
 
             The following matio specific options for building with CMake are
@@ -197,6 +200,8 @@ Table of Contents
               * 'MATIO_WITH_ZLIB:BOOL=ON'
                 This option enables CMake to check for availability of the
                 zlib library (see section 2.1.1 for information about zlib).
+              * 'MATIO_BUILD_TESTING:BOOL=ON'
+                This option enables the matio testsuite for CTest.
               * 'MATIO_ENABLE_CPPCHECK:BOOL=OFF'
                 This option enables CMake >= 3.10 to perform static analysis
                 with Cppcheck.
diff --git a/README.md b/README.md
index 72d0a76c..88e2c3f2 100644
--- a/README.md
+++ b/README.md
@@ -111,12 +111,14 @@ This option sets the default MAT file version (4,5,7.3) that will be used when w
 This option specifies a suffix to apply to library directories when installing and looking for dependent libraries (i.e. HDF5 and zlib). For example, some multi-arch Linux distributions install 64-bit libraries into lib64 and 32-bit libraries into lib.
 
 #### 2.2.3 CMake build system
-The CMake build system is supported as an alternative build system, which usually consists of three steps for configuration, build and installation, for example,
+The CMake build system is supported as an alternative build system, which usually consists of three steps for configuration, build and installation. By default, the CMake project is also configured for testing with CTest. For example,
 ```console
 git clone git://git.code.sf.net/p/matio/matio
 cd matio
+git submodule update --init  # for datasets used in unit tests
 cmake .
 cmake --build .
+ctest --test-dir .
 cmake --install .
 ```
 The following matio specific options for building with CMake are available.
@@ -137,6 +139,8 @@ This option builds the matio library as shared object (i.e., a dynamic link libr
 This option enables CMake to check for availability of the HDF5 library (see section [2.1.2](#212-hdf5) for information about HDF5).
 * `MATIO_WITH_ZLIB:BOOL=ON`
 This option enables CMake to check for availability of the zlib library (see section [2.1.1](#211-zlib) for information about zlib).
+* `MATIO_BUILD_TESTING:BOOL=ON`
+This option enables the matio testsuite for CTest.
 * `MATIO_ENABLE_CPPCHECK:BOOL=OFF`
 This option enables CMake &GreaterEqual; 3.10 to perform static analysis with Cppcheck.
 
diff --git a/cmake/options.cmake b/cmake/options.cmake
index 3a169848..9f80ed60 100644
--- a/cmake/options.cmake
+++ b/cmake/options.cmake
@@ -40,3 +40,11 @@ endif()
 if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.10")
     option(MATIO_ENABLE_CPPCHECK "Enable static analysis with Cppcheck." OFF)
 endif()
+
+# Option to enable matio testsuite
+option(MATIO_BUILD_TESTING "Build matio testing" ON)
+
+set(BUILD_TESTING OFF)
+if (MATIO_BUILD_TESTING)
+    set(BUILD_TESTING ON)
+endif()
diff --git a/cmake/test.cmake b/cmake/test.cmake
index 040c3a33..db517f24 100644
--- a/cmake/test.cmake
+++ b/cmake/test.cmake
@@ -1,19 +1,39 @@
-add_executable(test_mat ${PROJECT_SOURCE_DIR}/test/test_mat.c)
-target_link_libraries(test_mat matio)
-if(NOT HAVE_GETOPT)
-    target_link_libraries(test_mat getopt)
-endif()
+if(MATIO_BUILD_TESTING)
+    add_executable(test_mat "${PROJECT_SOURCE_DIR}/test/test_mat.c")
+    target_link_libraries(test_mat matio)
+    if(NOT HAVE_GETOPT)
+        target_link_libraries(test_mat getopt)
+    endif()
+
+    if(NOT HAVE_SNPRINTF OR UNIX)
+        add_executable(test_snprintf
+            "${PROJECT_SOURCE_DIR}/test/test_snprintf.c"
+            "${PROJECT_SOURCE_DIR}/snprintf/snprintf.c"
+        )
+        if(HAVE_LIBM)
+            target_link_libraries(test_snprintf m)
+        endif()
+        target_include_directories(test_snprintf PUBLIC
+            "${PROJECT_SOURCE_DIR}/src"
+            "${PROJECT_BINARY_DIR}/src"
+        )
+    endif()
 
-if(NOT HAVE_SNPRINTF OR UNIX)
-    add_executable(test_snprintf
-        ${PROJECT_SOURCE_DIR}/test/test_snprintf.c
-        ${PROJECT_SOURCE_DIR}/snprintf/snprintf.c
-    )
-    if(HAVE_LIBM)
-        target_link_libraries(test_snprintf m)
+    find_package(Python3 QUIET COMPONENTS Interpreter)
+    if(Python3_Interpreter_FOUND)
+        set(MATIO_CTESTS_DIR ${PROJECT_BINARY_DIR}/ctests)
+        execute_process(
+            COMMAND "${Python3_EXECUTABLE}" "${PROJECT_SOURCE_DIR}/test/convert_at_to_ctest.py" "${MATIO_CTESTS_DIR}"
+            WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}/test"
+        )
+        file(GLOB CMAKE_TEST_FILES "${MATIO_CTESTS_DIR}/*.cmake")
+        foreach(test_file ${CMAKE_TEST_FILES})
+            include(${test_file})
+        endforeach()
+    else()
+        message(WARNING
+            " Python3 not found."
+            " Set BUILD_TESTING to OFF to silence this warning."
+        )
     endif()
-    target_include_directories(test_snprintf PUBLIC
-        ${PROJECT_SOURCE_DIR}/src
-        ${PROJECT_BINARY_DIR}/src
-    )
 endif()
diff --git a/test/Makefile.am b/test/Makefile.am
index e7e2f4a9..f392ff70 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -438,7 +438,7 @@ CHECK_ENVIRONMENT = GREP=$(GREP) MAT73=$(MAT73) MATLABEXE=$(MATLABEXE) \
                     LIBTOOL="$(top_builddir)/libtool"
 
 EXTRA_DIST = $(TESTSUITE_AT) $(TESTSUITE) $(srcdir)/package.m4 \
-             $(TEST_DATAFILES)
+             $(TEST_DATAFILES) $(srcdir)/convert_at_to_ctest.py
 
 if NEED_GETOPT
     GETOPT_CFLAGS = -I$(top_builddir)/getopt
diff --git a/test/convert_at_to_ctest.py b/test/convert_at_to_ctest.py
new file mode 100644
index 00000000..5988432f
--- /dev/null
+++ b/test/convert_at_to_ctest.py
@@ -0,0 +1,198 @@
+import glob
+import hashlib
+import json
+import os
+import re
+import sys
+
+condition_mapping = {
+    'test $EXTENDED_SPARSE -ne 1': 'MATIO_EXTENDED_SPARSE',
+    'test $COMPRESSION_ZLIB -ne 1': 'HAVE_ZLIB',
+    'test $MAT73 -ne 1': 'MAT73 AND HAVE_HDF5',
+    'test $HAVE_INT64 -eq 0': 'HAVE_INT64',
+    'test $HAVE_UINT64 -eq 0': 'HAVE_UINT64',
+    '! grep -q "#define SIZEOF_VOID_P 4" $abs_top_builddir/src/matioConfig.h': 'CMAKE_SIZEOF_VOID_P EQUAL 4',
+    '! grep -q "#define SIZEOF_VOID_P 8" $abs_top_builddir/src/matioConfig.h': 'CMAKE_SIZEOF_VOID_P EQUAL 8',
+}
+
+command_mapping = {
+    '$srcdir/': '${PROJECT_SOURCE_DIR}/test/',
+    '$builddir/test_mat': '$<TARGET_FILE:test_mat>',
+    '$builddir/../tools/matdump': '$<TARGET_FILE:matdump>',
+}
+
+
+def get_file_hash(file_path, algorithm='md5'):
+    hash_obj = hashlib.new(algorithm)
+    with open(file_path, 'rb') as f:
+        for chunk in iter(lambda: f.read(4096), b''):
+            hash_obj.update(chunk)
+    return hash_obj.hexdigest()
+
+
+def convert_autotest_to_ctest(autotest_file, cmake_output_file, hash_dict):
+    base_name = os.path.splitext(os.path.basename(autotest_file))[0]
+    old_hash = hash_dict.get(base_name)
+    new_hash = get_file_hash(autotest_file)
+    if old_hash == new_hash:
+        return
+    else:
+        hash_dict[base_name] = new_hash
+
+    with open(autotest_file, 'r') as atf, open(cmake_output_file, 'w') as cmakef:
+        cmakef.write('# Auto-generated CMake/CTest tests\n')
+        cmakef.write('enable_testing()\n\n')
+
+        setup_re = re.compile(r'AT_SETUP\(\[([^\]]+)\]\)')
+        skip_if_re = re.compile(r'AT_SKIP_IF\(\[([^\]]+)\]\)')
+        check_re = re.compile(r'AT_CHECK\(\[([^\]]+)\]')
+        check_copy_re = re.compile(r'AT_CHECK\(\[cp (.*?) expout')
+        check_diff_re = re.compile(r'\s*(.*?)\],\[0\],\[expout\],\[\]\)')
+        cleanup_re = re.compile(r'AT_CLEANUP')
+        keyword_re = re.compile(r'AT_KEYWORDS\(\[([^\]]+)\]\)')
+
+        skip_conditions = []
+        test_keywords = []
+        counter = 1
+        check_copy_match = None
+        check_diff_match = None
+
+        for line in atf:
+            setup_match = setup_re.search(line)
+            skip_if_match = skip_if_re.search(line)
+            check_match = check_re.search(line)
+            if check_copy_match is None:
+                check_copy_match = check_copy_re.search(line)
+            if check_diff_match is None:
+                check_diff_match = check_diff_re.search(line)
+            cleanup_match = cleanup_re.search(line)
+            keyword_match = keyword_re.search(line)
+
+            if setup_match:
+                test_name = f'{base_name}_{re.sub(r"[ ()]", "_", setup_match.group(1))}'.lower()
+                cmakef.write(f'\n# {setup_match.group(1)}\n')
+                skip_conditions = ['True']
+                test_keywords = [base_name]
+                test_keywords.extend(base_name.split('_'))
+                counter = 1
+                check_copy_match = None
+                check_diff_match = None
+
+            elif keyword_match:
+                keywords = keyword_match.group(1).strip().split()
+                test_keywords.extend(keywords)
+
+            elif skip_if_match:
+                condition = skip_if_match.group(1).strip()
+
+                if condition in condition_mapping:
+                    mapped_condition = condition_mapping[condition]
+                    skip_conditions.append(mapped_condition)
+                else:
+                    skip_conditions.append(condition)
+
+            elif check_match:
+                command = check_match.group(1)
+                for original, replacement in command_mapping.items():
+                    command = command.replace(original, replacement)
+
+                if skip_conditions:
+                    if len(skip_conditions) > 1:
+                        skip_conditions = skip_conditions[1:]
+                    combined_conditions = ' AND '.join(skip_conditions)
+                    cmakef.write(f'if({combined_conditions})\n')
+                    skip_conditions = []
+
+                cmakef.write(f'    add_test(NAME {test_name}_{counter}\n')
+                cmakef.write(f'        COMMAND {command})\n')
+
+                if test_keywords:
+                    keyword_str = ';'.join(sorted(list(set(test_keywords))))
+                    cmakef.write(f'    set_tests_properties({test_name}_{counter} PROPERTIES LABELS "{keyword_str}")\n')
+
+                if counter > 1:
+                    depends_str = f'{test_name}_{counter - 1}'
+                    cmakef.write(f'    set_tests_properties({test_name}_{counter} PROPERTIES DEPENDS {depends_str})\n')
+
+                if 'write' in base_name or 'delete' in test_keywords:
+                    cmakef.write(f'    set_tests_properties({test_name}_{counter} PROPERTIES RUN_SERIAL ON)\n')
+
+                counter += 1
+
+            elif check_copy_match and check_diff_match:
+                command = check_diff_match.group(1)
+                for original, replacement in command_mapping.items():
+                    command = command.replace(original, replacement)
+
+                output_name = f'{test_name}_{counter}_output.txt'
+                if command.startswith('$<TARGET_FILE:'):
+                    command += f' -o {output_name}'
+
+                if skip_conditions:
+                    if len(skip_conditions) > 1:
+                        skip_conditions = skip_conditions[1:]
+                    combined_conditions = ' AND '.join(skip_conditions)
+                    cmakef.write(f'if({combined_conditions})\n')
+                    skip_conditions = []
+
+                cmakef.write(f'    add_test(NAME {test_name}_{counter}\n')
+                cmakef.write(f'        COMMAND {command})\n')
+
+                if test_keywords:
+                    keyword_str = ';'.join(sorted(list(set(test_keywords))))
+                    cmakef.write(f'    set_tests_properties({test_name}_{counter} PROPERTIES LABELS "read;{keyword_str}")\n')
+
+                if counter > 1:
+                    depends_str = f'{test_name}_{counter - 1}'
+                    cmakef.write(f'    set_tests_properties({test_name}_{counter} PROPERTIES DEPENDS {depends_str})\n')
+
+                if 'write' in base_name or 'delete' in test_keywords:
+                    cmakef.write(f'    set_tests_properties({test_name}_{counter} PROPERTIES RUN_SERIAL ON)\n')
+
+                expected_name = check_copy_match.group(1).replace('$srcdir/', '${PROJECT_SOURCE_DIR}/test/')
+                command = f'${{CMAKE_COMMAND}} -E compare_files --ignore-eol {expected_name} {output_name}'
+                cmakef.write(f'    add_test(NAME {test_name}_{counter + 1}\n')
+                cmakef.write(f'        COMMAND {command})\n')
+
+                if test_keywords:
+                    keyword_str = ';'.join(sorted(list(set(test_keywords))))
+                    cmakef.write(f'    set_tests_properties({test_name}_{counter + 1} PROPERTIES LABELS "diff;{keyword_str}")\n')
+
+                if counter > 1:
+                    depends_str = f'{test_name}_{counter}'
+                    cmakef.write(f'    set_tests_properties({test_name}_{counter + 1} PROPERTIES DEPENDS {depends_str})\n')
+
+                check_copy_match = None
+                check_diff_match = None
+                counter += 2
+
+            elif cleanup_match:
+                if counter > 1:
+                    cmakef.write('endif()\n')
+
+
+def generate_ctest_files(file_list, output_dir, hash_dict):
+    os.makedirs(output_dir, exist_ok=True)
+    for autotest_file in file_list:
+        base_name = os.path.splitext(os.path.basename(autotest_file))[0]
+        cmake_output_file = os.path.join(output_dir, f'{base_name}.cmake')
+        convert_autotest_to_ctest(autotest_file, cmake_output_file, hash_dict)
+
+
+if __name__ == '__main__':
+    file_list = glob.glob(os.path.join('tests', '*.at'))
+    output_dir = sys.argv[1]
+    hash_file = os.path.join(output_dir, 'testsuite.json')
+
+    # Load hashes
+    hash_dict = {}
+    if os.path.isfile(hash_file):
+        with open(hash_file, 'r') as jsonf:
+            hash_dict = json.load(jsonf)
+
+    # Generate test files
+    generate_ctest_files(file_list, output_dir, hash_dict)
+
+    # Store hashes
+    with open(hash_file, 'w') as jsonf:
+        json.dump(hash_dict, jsonf)
diff --git a/test/test_mat.c b/test/test_mat.c
index 26459329..c942ee63 100644
--- a/test/test_mat.c
+++ b/test/test_mat.c
@@ -4007,8 +4007,12 @@ main(int argc, char *argv[])
             if ( NULL == output_name )
                 output_name = "test_mat_copy.mat";
             mat = Mat_CreateVer(output_name, NULL, mat_file_ver);
+            if ( NULL == mat )
+                err++;
             mat2 = Mat_Open(argv[k++], MAT_ACC_RDONLY);
-            if ( mat && mat2 ) {
+            if ( NULL == mat2 )
+                err++;
+            if ( NULL != mat && NULL != mat2 ) {
                 while ( NULL != (matvar = Mat_VarReadNext(mat2)) ) {
                     matvar_t *copy = Mat_VarDuplicate(matvar, 1);
                     Mat_VarFree(matvar);
@@ -4019,9 +4023,11 @@ main(int argc, char *argv[])
                         err++;
                     }
                 }
-                Mat_Close(mat);
-                Mat_Close(mat2);
             }
+            if ( NULL != mat2 )
+                Mat_Close(mat2);
+            if ( NULL != mat )
+                Mat_Close(mat);
             ntests++;
         } else if ( !strcasecmp(argv[k], "delete") ) {
             k++;
@@ -4030,6 +4036,7 @@ main(int argc, char *argv[])
             ntests++;
         } else if ( !strcasecmp(argv[k], "directory") ) {
             k++;
+            redirect_output(output_name);
             err += test_directory(argv[k++]);
             ntests++;
         } else if ( !strcasecmp(argv[k], "write_2d_logical") ) {
@@ -4235,8 +4242,7 @@ main(int argc, char *argv[])
             ntests++;
         } else if ( !strcasecmp(argv[k], "readslab") ) {
             k++;
-            if ( NULL == output_name )
-                output_name = "XXX.mat";
+            redirect_output(output_name);
             test_readslab(argv[k], argv[k + 1], matvar_class);
             k += 2;
             ntests++;
diff --git a/test/tests/cell_api.at b/test/tests/cell_api.at
index edf40d1b..f3be0ce0 100644
--- a/test/tests/cell_api.at
+++ b/test/tests/cell_api.at
@@ -32,11 +32,11 @@ AT_CLEANUP
 AT_SETUP([Linearly index cell array])
 AT_KEYWORDS([cell_api])
 AT_CHECK([cp $srcdir/results/cell_api_getlinear.out expout
-          $builddir/test_mat  cell_api_getlinear],[0],[expout],[])
+          $builddir/test_mat cell_api_getlinear],[0],[expout],[])
 AT_CLEANUP
 
 AT_SETUP([Index cell array via dimension slices])
 AT_KEYWORDS([cell_api])
 AT_CHECK([cp $srcdir/results/cell_api_getcells.out expout
-          $builddir/test_mat  cell_api_getcells],[0],[expout],[])
+          $builddir/test_mat cell_api_getcells],[0],[expout],[])
 AT_CLEANUP
diff --git a/test/tests/mat4_readwrite.at b/test/tests/mat4_readwrite.at
index faa889a8..6bea5f81 100644
--- a/test/tests/mat4_readwrite.at
+++ b/test/tests/mat4_readwrite.at
@@ -26,28 +26,28 @@
 AT_SETUP([Copy variables])
 AT_KEYWORDS([copy])
 AT_SKIP_IF([! grep -q "#define SIZEOF_VOID_P 4" $abs_top_builddir/src/matioConfig.h])
-AT_CHECK([$builddir/test_mat -v 4 copy $srcdir/datasets/matio_test_cases_v4_le.mat],[0],[],[])
+AT_CHECK([$builddir/test_mat -v 4 -o test_mat4_copy.mat copy $srcdir/datasets/matio_test_cases_v4_le.mat],[0],[],[])
 AT_CHECK([cp $srcdir/results/dump-mat_copy-4_32.out expout
-          $builddir/../tools/matdump -f whos -h -d test_mat_copy.mat],[0],[expout],[])
+          $builddir/../tools/matdump -f whos -h -d test_mat4_copy.mat],[0],[expout],[])
 AT_CLEANUP
 
 AT_SETUP([Copy variables])
 AT_KEYWORDS([copy])
 AT_SKIP_IF([! grep -q "#define SIZEOF_VOID_P 8" $abs_top_builddir/src/matioConfig.h])
-AT_CHECK([$builddir/test_mat -v 4 copy $srcdir/datasets/matio_test_cases_v4_le.mat],[0],[],[])
+AT_CHECK([$builddir/test_mat -v 4 -o test_mat4_copy.mat copy $srcdir/datasets/matio_test_cases_v4_le.mat],[0],[],[])
 AT_CHECK([cp $srcdir/results/dump-mat_copy-4.out expout
-          $builddir/../tools/matdump -f whos -h -d test_mat_copy.mat],[0],[expout],[])
+          $builddir/../tools/matdump -f whos -h -d test_mat4_copy.mat],[0],[expout],[])
 AT_CLEANUP
 
 AT_SETUP([Delete variables])
 AT_KEYWORDS([delete])
-AT_CHECK([$builddir/test_mat -v 4 copy $srcdir/datasets/matio_test_cases_v4_le.mat],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var11],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var21],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var22],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var95],[0],[],[])
+AT_CHECK([$builddir/test_mat -v 4 -o test_mat4_delete.mat copy $srcdir/datasets/matio_test_cases_v4_le.mat],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat4_delete.mat var11],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat4_delete.mat var21],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat4_delete.mat var22],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat4_delete.mat var95],[0],[],[])
 AT_CHECK([cp $srcdir/results/dump-mat_copy-partial.out expout
-          $builddir/../tools/matdump -f whos -h -d test_mat_copy.mat],[0],[expout],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var1],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var24],[0],[],[])
+          $builddir/../tools/matdump -f whos -h -d test_mat4_delete.mat],[0],[expout],[])
+AT_CHECK([$builddir/test_mat delete test_mat4_delete.mat var1],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat4_delete.mat var24],[0],[],[])
 AT_CLEANUP
diff --git a/test/tests/mat5_compressed_extended_sparse.at b/test/tests/mat5_compressed_extended_sparse.at
index 3953c27c..afb4bb1b 100644
--- a/test/tests/mat5_compressed_extended_sparse.at
+++ b/test/tests/mat5_compressed_extended_sparse.at
@@ -42,7 +42,7 @@ AT_CLEANUP
 
 AT_SETUP([Write 2D sparse uint64 array])
 AT_SKIP_IF([test $EXTENDED_SPARSE -ne 1])
-AT_SKIP_IF([test $HAVE_INT64 -eq 0])
+AT_SKIP_IF([test $HAVE_UINT64 -eq 0])
 AT_SKIP_IF([test $COMPRESSION_ZLIB -ne 1])
 AT_CHECK([$builddir/test_mat -v 5 -z -c uint64 write_sparse],[0],[],[])
 AT_CHECK([cp $srcdir/results/readvar-write_sparse-sparse_matrix-uint64.out expout
@@ -116,7 +116,7 @@ AT_CLEANUP
 
 AT_SETUP([Write 2D sparse complex uint64 array])
 AT_SKIP_IF([test $EXTENDED_SPARSE -ne 1])
-AT_SKIP_IF([test $HAVE_INT64 -eq 0])
+AT_SKIP_IF([test $HAVE_UINT64 -eq 0])
 AT_SKIP_IF([test $COMPRESSION_ZLIB -ne 1])
 AT_CHECK([$builddir/test_mat -v 5 -z -c uint64 write_complex_sparse],[0],[],[])
 AT_CHECK([cp $srcdir/results/readvar-write_complex_sparse-sparse_matrix-uint64.out expout
diff --git a/test/tests/mat5_compressed_read_be.at b/test/tests/mat5_compressed_read_be.at
index b50fe46a..59af0c47 100644
--- a/test/tests/mat5_compressed_read_be.at
+++ b/test/tests/mat5_compressed_read_be.at
@@ -88,7 +88,7 @@ AT_CLEANUP
 AT_SETUP([Read 2D complex double array])
 AT_SKIP_IF([test $COMPRESSION_ZLIB -ne 1])
 AT_CHECK([cp $srcdir/results/read-var11.out expout
-          $builddir/test_mat readvar $srcdir/datasets/matio_test_cases_compressed_be.mat var11],[0], [[expout]],[])
+          $builddir/test_mat readvar $srcdir/datasets/matio_test_cases_compressed_be.mat var11],[0],[expout],[])
 AT_CHECK([cp $srcdir/results/dump-var11.out expout
           $builddir/../tools/matdump -d $srcdir/datasets/matio_test_cases_compressed_be.mat var11],[0],[expout],[])
 AT_CLEANUP
@@ -150,7 +150,7 @@ AT_CLEANUP
 AT_SETUP([Read 2D logical array])
 AT_SKIP_IF([test $COMPRESSION_ZLIB -ne 1])
 AT_CHECK([cp $srcdir/results/read-var90.out expout
-          $builddir/test_mat readvar $srcdir/datasets/matio_test_cases_compressed_be.mat var90],[0], [[expout]],[])
+          $builddir/test_mat readvar $srcdir/datasets/matio_test_cases_compressed_be.mat var90],[0],[expout],[])
 AT_CLEANUP
 
 AT_SETUP([Read sparse double array])
@@ -169,7 +169,7 @@ AT_SETUP([Read empty array])
 AT_KEYWORDS([empty])
 AT_SKIP_IF([test $COMPRESSION_ZLIB -ne 1])
 AT_CHECK([cp $srcdir/results/read-var23.out expout
-          $builddir/test_mat readvar $srcdir/datasets/matio_test_cases_compressed_be.mat var23],[0], [[expout]],[])
+          $builddir/test_mat readvar $srcdir/datasets/matio_test_cases_compressed_be.mat var23],[0],[expout],[])
 AT_CLEANUP
 
 AT_SETUP([Read 2D character array])
@@ -322,7 +322,7 @@ AT_CLEANUP
 AT_SETUP([Read struct with logical fields])
 AT_SKIP_IF([test $COMPRESSION_ZLIB -ne 1])
 AT_CHECK([cp $srcdir/results/read-var91.out expout
-          $builddir/test_mat readvar $srcdir/datasets/matio_test_cases_compressed_be.mat var91],[0], [[expout]],[])
+          $builddir/test_mat readvar $srcdir/datasets/matio_test_cases_compressed_be.mat var91],[0],[expout],[])
 AT_CLEANUP
 
 AT_SETUP([Read struct with sparse double fields])
diff --git a/test/tests/mat5_compressed_read_le.at b/test/tests/mat5_compressed_read_le.at
index 6c64c545..5ac9139d 100644
--- a/test/tests/mat5_compressed_read_le.at
+++ b/test/tests/mat5_compressed_read_le.at
@@ -88,7 +88,7 @@ AT_CLEANUP
 AT_SETUP([Read 2D complex double array])
 AT_SKIP_IF([test $COMPRESSION_ZLIB -ne 1])
 AT_CHECK([cp $srcdir/results/read-var11.out expout
-          $builddir/test_mat readvar $srcdir/datasets/matio_test_cases_compressed_le.mat var11],[0], [expout],[])
+          $builddir/test_mat readvar $srcdir/datasets/matio_test_cases_compressed_le.mat var11],[0],[expout],[])
 AT_CHECK([cp $srcdir/results/dump-var11.out expout
           $builddir/../tools/matdump -d $srcdir/datasets/matio_test_cases_compressed_le.mat var11],[0],[expout],[])
 AT_CLEANUP
@@ -150,7 +150,7 @@ AT_CLEANUP
 AT_SETUP([Read 2D logical array])
 AT_SKIP_IF([test $COMPRESSION_ZLIB -ne 1])
 AT_CHECK([cp $srcdir/results/read-var90.out expout
-          $builddir/test_mat readvar $srcdir/datasets/matio_test_cases_compressed_le.mat var90],[0], [expout],[])
+          $builddir/test_mat readvar $srcdir/datasets/matio_test_cases_compressed_le.mat var90],[0],[expout],[])
 AT_CLEANUP
 
 AT_SETUP([Read sparse double array])
@@ -169,7 +169,7 @@ AT_SETUP([Read empty array])
 AT_KEYWORDS([empty])
 AT_SKIP_IF([test $COMPRESSION_ZLIB -ne 1])
 AT_CHECK([cp $srcdir/results/read-var23.out expout
-          $builddir/test_mat readvar $srcdir/datasets/matio_test_cases_compressed_le.mat var23],[0], [expout],[])
+          $builddir/test_mat readvar $srcdir/datasets/matio_test_cases_compressed_le.mat var23],[0],[expout],[])
 AT_CLEANUP
 
 AT_SETUP([Read 2D character array])
@@ -328,7 +328,7 @@ AT_CLEANUP
 AT_SETUP([Read struct with logical fields])
 AT_SKIP_IF([test $COMPRESSION_ZLIB -ne 1])
 AT_CHECK([cp $srcdir/results/read-var91.out expout
-          $builddir/test_mat readvar $srcdir/datasets/matio_test_cases_compressed_le.mat var91],[0], [expout],[])
+          $builddir/test_mat readvar $srcdir/datasets/matio_test_cases_compressed_le.mat var91],[0],[expout],[])
 AT_CLEANUP
 
 AT_SETUP([Read struct with sparse double fields])
diff --git a/test/tests/mat5_compressed_readslab_be.at b/test/tests/mat5_compressed_readslab_be.at
index 776b13ab..5b732e09 100644
--- a/test/tests/mat5_compressed_readslab_be.at
+++ b/test/tests/mat5_compressed_readslab_be.at
@@ -30,7 +30,7 @@ AT_CHECK([cp $srcdir/results/dump-var70-1.out expout
           $builddir/../tools/matdump -d $srcdir/datasets/matio_test_cases_compressed_be.mat var70\(2:3:end,4:5:end,8:16:end\)],[0],[expout],[])
 AT_CHECK([cp $srcdir/results/dump-var70-2.out expout
           $builddir/../tools/matdump -d $srcdir/datasets/matio_test_cases_compressed_be.mat var70\(30:1:32,27:1:29,25:1:26\)],[0],[expout],[])
-AT_CHECK([$builddir/test_mat reshape32x32x32 -v 5 -z $srcdir/datasets/matio_test_cases_compressed_be.mat var70], [0], [],[])
+AT_CHECK([$builddir/test_mat reshape32x32x32 -v 5 -z $srcdir/datasets/matio_test_cases_compressed_be.mat var70],[0],[],[])
 AT_CHECK([cp $srcdir/results/dump-var7x-3.out expout
           $builddir/../tools/matdump -d test_write_reshape32x32x32.mat var70\(2:30:end,4:50:end\)],[0],[expout],[])
 AT_CLEANUP
@@ -42,7 +42,7 @@ AT_CHECK([cp $srcdir/results/dump-var71-1.out expout
           $builddir/../tools/matdump -d $srcdir/datasets/matio_test_cases_compressed_be.mat var71\(2:3:end,4:5:end,8:16:end\)],[0],[expout],[])
 AT_CHECK([cp $srcdir/results/dump-var71-2.out expout
           $builddir/../tools/matdump -d $srcdir/datasets/matio_test_cases_compressed_be.mat var71\(30:1:32,27:1:29,25:1:26\)],[0],[expout],[])
-AT_CHECK([$builddir/test_mat reshape32x32x32 -v 5 -z $srcdir/datasets/matio_test_cases_compressed_be.mat var71], [0], [],[])
+AT_CHECK([$builddir/test_mat reshape32x32x32 -v 5 -z $srcdir/datasets/matio_test_cases_compressed_be.mat var71],[0],[],[])
 AT_CHECK([cp $srcdir/results/dump-var7x-3.out expout
           $builddir/../tools/matdump -d test_write_reshape32x32x32.mat var71\(2:30:end,4:50:end\)],[0],[expout],[])
 AT_CLEANUP
@@ -54,7 +54,7 @@ AT_CHECK([cp $srcdir/results/dump-var72-1.out expout
           $builddir/../tools/matdump -d $srcdir/datasets/matio_test_cases_compressed_be.mat var72\(2:3:end,4:5:end,8:16:end\)],[0],[expout],[])
 AT_CHECK([cp $srcdir/results/dump-var72-2.out expout
           $builddir/../tools/matdump -d $srcdir/datasets/matio_test_cases_compressed_be.mat var72\(30:1:32,27:1:29,25:1:26\)],[0],[expout],[])
-AT_CHECK([$builddir/test_mat reshape32x32x32 -v 5 -z $srcdir/datasets/matio_test_cases_compressed_be.mat var72], [0], [],[])
+AT_CHECK([$builddir/test_mat reshape32x32x32 -v 5 -z $srcdir/datasets/matio_test_cases_compressed_be.mat var72],[0],[],[])
 AT_CHECK([cp $srcdir/results/dump-var7x-3.out expout
           $builddir/../tools/matdump -d test_write_reshape32x32x32.mat var72\(2:30:end,4:50:end\)],[0],[expout],[])
 AT_CLEANUP
@@ -66,7 +66,7 @@ AT_CHECK([cp $srcdir/results/dump-var73-1.out expout
           $builddir/../tools/matdump -d $srcdir/datasets/matio_test_cases_compressed_be.mat var73\(2:3:end,4:5:end,8:16:end\)],[0],[expout],[])
 AT_CHECK([cp $srcdir/results/dump-var73-2.out expout
           $builddir/../tools/matdump -d $srcdir/datasets/matio_test_cases_compressed_be.mat var73\(30:1:32,27:1:29,25:1:26\)],[0],[expout],[])
-AT_CHECK([$builddir/test_mat reshape32x32x32 -v 5 -z $srcdir/datasets/matio_test_cases_compressed_be.mat var73], [0], [],[])
+AT_CHECK([$builddir/test_mat reshape32x32x32 -v 5 -z $srcdir/datasets/matio_test_cases_compressed_be.mat var73],[0],[],[])
 AT_CHECK([cp $srcdir/results/dump-var7x-3.out expout
           $builddir/../tools/matdump -d test_write_reshape32x32x32.mat var73\(2:30:end,4:50:end\)],[0],[expout],[])
 AT_CLEANUP
@@ -78,7 +78,7 @@ AT_CHECK([cp $srcdir/results/dump-var74-1.out expout
           $builddir/../tools/matdump -d $srcdir/datasets/matio_test_cases_compressed_be.mat var74\(2:3:end,4:5:end,8:16:end\)],[0],[expout],[])
 AT_CHECK([cp $srcdir/results/dump-var74-2.out expout
           $builddir/../tools/matdump -d $srcdir/datasets/matio_test_cases_compressed_be.mat var74\(30:1:32,27:1:29,25:1:26\)],[0],[expout],[])
-AT_CHECK([$builddir/test_mat reshape32x32x32 -v 5 -z $srcdir/datasets/matio_test_cases_compressed_be.mat var74], [0], [],[])
+AT_CHECK([$builddir/test_mat reshape32x32x32 -v 5 -z $srcdir/datasets/matio_test_cases_compressed_be.mat var74],[0],[],[])
 AT_CHECK([cp $srcdir/results/dump-var7x-3.out expout
           $builddir/../tools/matdump -d test_write_reshape32x32x32.mat var74\(2:30:end,4:50:end\)],[0],[expout],[])
 AT_CLEANUP
@@ -90,7 +90,7 @@ AT_CHECK([cp $srcdir/results/dump-var75-1.out expout
           $builddir/../tools/matdump -d $srcdir/datasets/matio_test_cases_compressed_be.mat var75\(2:3:end,4:5:end,8:16:end\)],[0],[expout],[])
 AT_CHECK([cp $srcdir/results/dump-var75-2.out expout
           $builddir/../tools/matdump -d $srcdir/datasets/matio_test_cases_compressed_be.mat var75\(30:1:32,27:1:29,25:1:26\)],[0],[expout],[])
-AT_CHECK([$builddir/test_mat reshape32x32x32 -v 5 -z $srcdir/datasets/matio_test_cases_compressed_be.mat var75], [0], [],[])
+AT_CHECK([$builddir/test_mat reshape32x32x32 -v 5 -z $srcdir/datasets/matio_test_cases_compressed_be.mat var75],[0],[],[])
 AT_CHECK([cp $srcdir/results/dump-var7x-3.out expout
           $builddir/../tools/matdump -d test_write_reshape32x32x32.mat var75\(2:30:end,4:50:end\)],[0],[expout],[])
 AT_CLEANUP
@@ -102,7 +102,7 @@ AT_CHECK([cp $srcdir/results/dump-var76-1.out expout
           $builddir/../tools/matdump -d $srcdir/datasets/matio_test_cases_compressed_be.mat var76\(2:3:end,4:5:end,8:16:end\)],[0],[expout],[])
 AT_CHECK([cp $srcdir/results/dump-var76-2.out expout
           $builddir/../tools/matdump -d $srcdir/datasets/matio_test_cases_compressed_be.mat var76\(30:1:32,27:1:29,25:1:26\)],[0],[expout],[])
-AT_CHECK([$builddir/test_mat reshape32x32x32 -v 5 -z $srcdir/datasets/matio_test_cases_compressed_be.mat var76], [0], [],[])
+AT_CHECK([$builddir/test_mat reshape32x32x32 -v 5 -z $srcdir/datasets/matio_test_cases_compressed_be.mat var76],[0],[],[])
 AT_CHECK([cp $srcdir/results/dump-var7x-3.out expout
           $builddir/../tools/matdump -d test_write_reshape32x32x32.mat var76\(2:30:end,4:50:end\)],[0],[expout],[])
 AT_CLEANUP
@@ -114,7 +114,7 @@ AT_CHECK([cp $srcdir/results/dump-var77-1.out expout
           $builddir/../tools/matdump -d $srcdir/datasets/matio_test_cases_compressed_be.mat var77\(2:3:end,4:5:end,8:16:end\)],[0],[expout],[])
 AT_CHECK([cp $srcdir/results/dump-var77-2.out expout
           $builddir/../tools/matdump -d $srcdir/datasets/matio_test_cases_compressed_be.mat var77\(30:1:32,27:1:29,25:1:26\)],[0],[expout],[])
-AT_CHECK([$builddir/test_mat reshape32x32x32 -v 5 -z $srcdir/datasets/matio_test_cases_compressed_be.mat var77], [0], [],[])
+AT_CHECK([$builddir/test_mat reshape32x32x32 -v 5 -z $srcdir/datasets/matio_test_cases_compressed_be.mat var77],[0],[],[])
 AT_CHECK([cp $srcdir/results/dump-var7x-3.out expout
           $builddir/../tools/matdump -d test_write_reshape32x32x32.mat var77\(2:30:end,4:50:end\)],[0],[expout],[])
 AT_CLEANUP
@@ -126,7 +126,7 @@ AT_CHECK([cp $srcdir/results/dump-var78-1.out expout
           $builddir/../tools/matdump -d $srcdir/datasets/matio_test_cases_compressed_be.mat var78\(2:3:end,4:5:end,8:16:end\)],[0],[expout],[])
 AT_CHECK([cp $srcdir/results/dump-var78-2.out expout
           $builddir/../tools/matdump -d $srcdir/datasets/matio_test_cases_compressed_be.mat var78\(30:1:32,27:1:29,25:1:26\)],[0],[expout],[])
-AT_CHECK([$builddir/test_mat reshape32x32x32 -v 5 -z $srcdir/datasets/matio_test_cases_compressed_be.mat var78], [0], [],[])
+AT_CHECK([$builddir/test_mat reshape32x32x32 -v 5 -z $srcdir/datasets/matio_test_cases_compressed_be.mat var78],[0],[],[])
 AT_CHECK([cp $srcdir/results/dump-var78-3.out expout
           $builddir/../tools/matdump -d test_write_reshape32x32x32.mat var78\(2:30:end,4:50:end\)],[0],[expout],[])
 AT_CLEANUP
@@ -138,7 +138,7 @@ AT_CHECK([cp $srcdir/results/dump-var79-1.out expout
           $builddir/../tools/matdump -d $srcdir/datasets/matio_test_cases_compressed_be.mat var79\(2:3:end,4:5:end,8:16:end\)],[0],[expout],[])
 AT_CHECK([cp $srcdir/results/dump-var79-2.out expout
           $builddir/../tools/matdump -d $srcdir/datasets/matio_test_cases_compressed_be.mat var79\(30:1:32,27:1:29,25:1:26\)],[0],[expout],[])
-AT_CHECK([$builddir/test_mat reshape32x32x32 -v 5 -z $srcdir/datasets/matio_test_cases_compressed_be.mat var79], [0], [],[])
+AT_CHECK([$builddir/test_mat reshape32x32x32 -v 5 -z $srcdir/datasets/matio_test_cases_compressed_be.mat var79],[0],[],[])
 AT_CHECK([cp $srcdir/results/dump-var79-3.out expout
           $builddir/../tools/matdump -d test_write_reshape32x32x32.mat var79\(2:30:end,4:50:end\)],[0],[expout],[])
 AT_CLEANUP
@@ -150,7 +150,7 @@ AT_CHECK([cp $srcdir/results/dump-var80-1.out expout
           $builddir/../tools/matdump -d $srcdir/datasets/matio_test_cases_compressed_be.mat var80\(2:3:end,4:5:end,8:16:end\)],[0],[expout],[])
 AT_CHECK([cp $srcdir/results/dump-var80-2.out expout
           $builddir/../tools/matdump -d $srcdir/datasets/matio_test_cases_compressed_be.mat var80\(30:1:32,27:1:29,25:1:26\)],[0],[expout],[])
-AT_CHECK([$builddir/test_mat reshape32x32x32 -v 5 -z $srcdir/datasets/matio_test_cases_compressed_be.mat var80], [0], [],[])
+AT_CHECK([$builddir/test_mat reshape32x32x32 -v 5 -z $srcdir/datasets/matio_test_cases_compressed_be.mat var80],[0],[],[])
 AT_CHECK([cp $srcdir/results/dump-var8x-3.out expout
           $builddir/../tools/matdump -d test_write_reshape32x32x32.mat var80\(2:30:end,4:50:end\)],[0],[expout],[])
 AT_CLEANUP
@@ -162,7 +162,7 @@ AT_CHECK([cp $srcdir/results/dump-var81-1.out expout
           $builddir/../tools/matdump -d $srcdir/datasets/matio_test_cases_compressed_be.mat var81\(2:3:end,4:5:end,8:16:end\)],[0],[expout],[])
 AT_CHECK([cp $srcdir/results/dump-var81-2.out expout
           $builddir/../tools/matdump -d $srcdir/datasets/matio_test_cases_compressed_be.mat var81\(30:1:32,27:1:29,25:1:26\)],[0],[expout],[])
-AT_CHECK([$builddir/test_mat reshape32x32x32 -v 5 -z $srcdir/datasets/matio_test_cases_compressed_be.mat var81], [0], [],[])
+AT_CHECK([$builddir/test_mat reshape32x32x32 -v 5 -z $srcdir/datasets/matio_test_cases_compressed_be.mat var81],[0],[],[])
 AT_CHECK([cp $srcdir/results/dump-var8x-3.out expout
           $builddir/../tools/matdump -d test_write_reshape32x32x32.mat var81\(2:30:end,4:50:end\)],[0],[expout],[])
 AT_CLEANUP
@@ -174,7 +174,7 @@ AT_CHECK([cp $srcdir/results/dump-var82-1.out expout
           $builddir/../tools/matdump -d $srcdir/datasets/matio_test_cases_compressed_be.mat var82\(2:3:end,4:5:end,8:16:end\)],[0],[expout],[])
 AT_CHECK([cp $srcdir/results/dump-var82-2.out expout
           $builddir/../tools/matdump -d $srcdir/datasets/matio_test_cases_compressed_be.mat var82\(30:1:32,27:1:29,25:1:26\)],[0],[expout],[])
-AT_CHECK([$builddir/test_mat reshape32x32x32 -v 5 -z $srcdir/datasets/matio_test_cases_compressed_be.mat var82], [0], [],[])
+AT_CHECK([$builddir/test_mat reshape32x32x32 -v 5 -z $srcdir/datasets/matio_test_cases_compressed_be.mat var82],[0],[],[])
 AT_CHECK([cp $srcdir/results/dump-var8x-3.out expout
           $builddir/../tools/matdump -d test_write_reshape32x32x32.mat var82\(2:30:end,4:50:end\)],[0],[expout],[])
 AT_CLEANUP
@@ -186,7 +186,7 @@ AT_CHECK([cp $srcdir/results/dump-var83-1.out expout
           $builddir/../tools/matdump -d $srcdir/datasets/matio_test_cases_compressed_be.mat var83\(2:3:end,4:5:end,8:16:end\)],[0],[expout],[])
 AT_CHECK([cp $srcdir/results/dump-var83-2.out expout
           $builddir/../tools/matdump -d $srcdir/datasets/matio_test_cases_compressed_be.mat var83\(30:1:32,27:1:29,25:1:26\)],[0],[expout],[])
-AT_CHECK([$builddir/test_mat reshape32x32x32 -v 5 -z $srcdir/datasets/matio_test_cases_compressed_be.mat var83], [0], [],[])
+AT_CHECK([$builddir/test_mat reshape32x32x32 -v 5 -z $srcdir/datasets/matio_test_cases_compressed_be.mat var83],[0],[],[])
 AT_CHECK([cp $srcdir/results/dump-var8x-3.out expout
           $builddir/../tools/matdump -d test_write_reshape32x32x32.mat var83\(2:30:end,4:50:end\)],[0],[expout],[])
 AT_CLEANUP
@@ -198,7 +198,7 @@ AT_CHECK([cp $srcdir/results/dump-var84-1.out expout
           $builddir/../tools/matdump -d $srcdir/datasets/matio_test_cases_compressed_be.mat var84\(2:3:end,4:5:end,8:16:end\)],[0],[expout],[])
 AT_CHECK([cp $srcdir/results/dump-var84-2.out expout
           $builddir/../tools/matdump -d $srcdir/datasets/matio_test_cases_compressed_be.mat var84\(30:1:32,27:1:29,25:1:26\)],[0],[expout],[])
-AT_CHECK([$builddir/test_mat reshape32x32x32 -v 5 -z $srcdir/datasets/matio_test_cases_compressed_be.mat var84], [0], [],[])
+AT_CHECK([$builddir/test_mat reshape32x32x32 -v 5 -z $srcdir/datasets/matio_test_cases_compressed_be.mat var84],[0],[],[])
 AT_CHECK([cp $srcdir/results/dump-var8x-3.out expout
           $builddir/../tools/matdump -d test_write_reshape32x32x32.mat var84\(2:30:end,4:50:end\)],[0],[expout],[])
 AT_CLEANUP
@@ -210,7 +210,7 @@ AT_CHECK([cp $srcdir/results/dump-var85-1.out expout
           $builddir/../tools/matdump -d $srcdir/datasets/matio_test_cases_compressed_be.mat var85\(2:3:end,4:5:end,8:16:end\)],[0],[expout],[])
 AT_CHECK([cp $srcdir/results/dump-var85-2.out expout
           $builddir/../tools/matdump -d $srcdir/datasets/matio_test_cases_compressed_be.mat var85\(30:1:32,27:1:29,25:1:26\)],[0],[expout],[])
-AT_CHECK([$builddir/test_mat reshape32x32x32 -v 5 -z $srcdir/datasets/matio_test_cases_compressed_be.mat var85], [0], [],[])
+AT_CHECK([$builddir/test_mat reshape32x32x32 -v 5 -z $srcdir/datasets/matio_test_cases_compressed_be.mat var85],[0],[],[])
 AT_CHECK([cp $srcdir/results/dump-var8x-3.out expout
           $builddir/../tools/matdump -d test_write_reshape32x32x32.mat var85\(2:30:end,4:50:end\)],[0],[expout],[])
 AT_CLEANUP
@@ -222,7 +222,7 @@ AT_CHECK([cp $srcdir/results/dump-var86-1.out expout
           $builddir/../tools/matdump -d $srcdir/datasets/matio_test_cases_compressed_be.mat var86\(2:3:end,4:5:end,8:16:end\)],[0],[expout],[])
 AT_CHECK([cp $srcdir/results/dump-var86-2.out expout
           $builddir/../tools/matdump -d $srcdir/datasets/matio_test_cases_compressed_be.mat var86\(30:1:32,27:1:29,25:1:26\)],[0],[expout],[])
-AT_CHECK([$builddir/test_mat reshape32x32x32 -v 5 -z $srcdir/datasets/matio_test_cases_compressed_be.mat var86], [0], [],[])
+AT_CHECK([$builddir/test_mat reshape32x32x32 -v 5 -z $srcdir/datasets/matio_test_cases_compressed_be.mat var86],[0],[],[])
 AT_CHECK([cp $srcdir/results/dump-var86-3.out expout
           $builddir/../tools/matdump -d test_write_reshape32x32x32.mat var86\(2:30:end,4:50:end\)],[0],[expout],[])
 AT_CLEANUP
@@ -234,7 +234,7 @@ AT_CHECK([cp $srcdir/results/dump-var87-1.out expout
           $builddir/../tools/matdump -d $srcdir/datasets/matio_test_cases_compressed_be.mat var87\(2:3:end,4:5:end,8:16:end\)],[0],[expout],[])
 AT_CHECK([cp $srcdir/results/dump-var87-2.out expout
           $builddir/../tools/matdump -d $srcdir/datasets/matio_test_cases_compressed_be.mat var87\(30:1:32,27:1:29,25:1:26\)],[0],[expout],[])
-AT_CHECK([$builddir/test_mat reshape32x32x32 -v 5 -z $srcdir/datasets/matio_test_cases_compressed_be.mat var87], [0], [],[])
+AT_CHECK([$builddir/test_mat reshape32x32x32 -v 5 -z $srcdir/datasets/matio_test_cases_compressed_be.mat var87],[0],[],[])
 AT_CHECK([cp $srcdir/results/dump-var87-3.out expout
           $builddir/../tools/matdump -d test_write_reshape32x32x32.mat var87\(2:30:end,4:50:end\)],[0],[expout],[])
 AT_CLEANUP
@@ -246,7 +246,7 @@ AT_CHECK([cp $srcdir/results/dump-var88-1.out expout
           $builddir/../tools/matdump -d $srcdir/datasets/matio_test_cases_compressed_be.mat var88\(2:3:end,4:5:end,8:16:end\)],[0],[expout],[])
 AT_CHECK([cp $srcdir/results/dump-var88-2.out expout
           $builddir/../tools/matdump -d $srcdir/datasets/matio_test_cases_compressed_be.mat var88\(30:1:32,27:1:29,25:1:26\)],[0],[expout],[])
-AT_CHECK([$builddir/test_mat reshape32x32x32 -v 5 -z $srcdir/datasets/matio_test_cases_compressed_be.mat var88], [0], [],[])
+AT_CHECK([$builddir/test_mat reshape32x32x32 -v 5 -z $srcdir/datasets/matio_test_cases_compressed_be.mat var88],[0],[],[])
 AT_CHECK([cp $srcdir/results/dump-var88-3.out expout
           $builddir/../tools/matdump -d test_write_reshape32x32x32.mat var88\(2:30:end,4:50:end\)],[0],[expout],[])
 AT_CLEANUP
@@ -258,7 +258,7 @@ AT_CHECK([cp $srcdir/results/dump-var89-1.out expout
           $builddir/../tools/matdump -d $srcdir/datasets/matio_test_cases_compressed_be.mat var89\(2:3:end,4:5:end,8:16:end\)],[0],[expout],[])
 AT_CHECK([cp $srcdir/results/dump-var89-2.out expout
           $builddir/../tools/matdump -d $srcdir/datasets/matio_test_cases_compressed_be.mat var89\(30:1:32,27:1:29,25:1:26\)],[0],[expout],[])
-AT_CHECK([$builddir/test_mat reshape32x32x32 -v 5 -z $srcdir/datasets/matio_test_cases_compressed_be.mat var89], [0], [],[])
+AT_CHECK([$builddir/test_mat reshape32x32x32 -v 5 -z $srcdir/datasets/matio_test_cases_compressed_be.mat var89],[0],[],[])
 AT_CHECK([cp $srcdir/results/dump-var89-3.out expout
           $builddir/../tools/matdump -d test_write_reshape32x32x32.mat var89\(2:30:end,4:50:end\)],[0],[expout],[])
 AT_CLEANUP
diff --git a/test/tests/mat5_compressed_readslab_le.at b/test/tests/mat5_compressed_readslab_le.at
index 0f337166..1bf36eb4 100644
--- a/test/tests/mat5_compressed_readslab_le.at
+++ b/test/tests/mat5_compressed_readslab_le.at
@@ -30,7 +30,7 @@ AT_CHECK([cp $srcdir/results/dump-var70-1.out expout
           $builddir/../tools/matdump -d $srcdir/datasets/matio_test_cases_compressed_le.mat var70\(2:3:end,4:5:end,8:16:end\)],[0],[expout],[])
 AT_CHECK([cp $srcdir/results/dump-var70-2.out expout
           $builddir/../tools/matdump -d $srcdir/datasets/matio_test_cases_compressed_le.mat var70\(30:1:32,27:1:29,25:1:26\)],[0],[expout],[])
-AT_CHECK([$builddir/test_mat reshape32x32x32 -v 5 -z $srcdir/datasets/matio_test_cases_compressed_le.mat var70], [0], [],[])
+AT_CHECK([$builddir/test_mat reshape32x32x32 -v 5 -z $srcdir/datasets/matio_test_cases_compressed_le.mat var70],[0],[],[])
 AT_CHECK([cp $srcdir/results/dump-var7x-3.out expout
           $builddir/../tools/matdump -d test_write_reshape32x32x32.mat var70\(2:30:end,4:50:end\)],[0],[expout],[])
 AT_CLEANUP
@@ -42,7 +42,7 @@ AT_CHECK([cp $srcdir/results/dump-var71-1.out expout
           $builddir/../tools/matdump -d $srcdir/datasets/matio_test_cases_compressed_le.mat var71\(2:3:end,4:5:end,8:16:end\)],[0],[expout],[])
 AT_CHECK([cp $srcdir/results/dump-var71-2.out expout
           $builddir/../tools/matdump -d $srcdir/datasets/matio_test_cases_compressed_le.mat var71\(30:1:32,27:1:29,25:1:26\)],[0],[expout],[])
-AT_CHECK([$builddir/test_mat reshape32x32x32 -v 5 -z $srcdir/datasets/matio_test_cases_compressed_le.mat var71], [0], [],[])
+AT_CHECK([$builddir/test_mat reshape32x32x32 -v 5 -z $srcdir/datasets/matio_test_cases_compressed_le.mat var71],[0],[],[])
 AT_CHECK([cp $srcdir/results/dump-var7x-3.out expout
           $builddir/../tools/matdump -d test_write_reshape32x32x32.mat var71\(2:30:end,4:50:end\)],[0],[expout],[])
 AT_CLEANUP
@@ -54,7 +54,7 @@ AT_CHECK([cp $srcdir/results/dump-var72-1.out expout
           $builddir/../tools/matdump -d $srcdir/datasets/matio_test_cases_compressed_le.mat var72\(2:3:end,4:5:end,8:16:end\)],[0],[expout],[])
 AT_CHECK([cp $srcdir/results/dump-var72-2.out expout
           $builddir/../tools/matdump -d $srcdir/datasets/matio_test_cases_compressed_le.mat var72\(30:1:32,27:1:29,25:1:26\)],[0],[expout],[])
-AT_CHECK([$builddir/test_mat reshape32x32x32 -v 5 -z $srcdir/datasets/matio_test_cases_compressed_le.mat var72], [0], [],[])
+AT_CHECK([$builddir/test_mat reshape32x32x32 -v 5 -z $srcdir/datasets/matio_test_cases_compressed_le.mat var72],[0],[],[])
 AT_CHECK([cp $srcdir/results/dump-var7x-3.out expout
           $builddir/../tools/matdump -d test_write_reshape32x32x32.mat var72\(2:30:end,4:50:end\)],[0],[expout],[])
 AT_CLEANUP
@@ -66,7 +66,7 @@ AT_CHECK([cp $srcdir/results/dump-var73-1.out expout
           $builddir/../tools/matdump -d $srcdir/datasets/matio_test_cases_compressed_le.mat var73\(2:3:end,4:5:end,8:16:end\)],[0],[expout],[])
 AT_CHECK([cp $srcdir/results/dump-var73-2.out expout
           $builddir/../tools/matdump -d $srcdir/datasets/matio_test_cases_compressed_le.mat var73\(30:1:32,27:1:29,25:1:26\)],[0],[expout],[])
-AT_CHECK([$builddir/test_mat reshape32x32x32 -v 5 -z $srcdir/datasets/matio_test_cases_compressed_le.mat var73], [0], [],[])
+AT_CHECK([$builddir/test_mat reshape32x32x32 -v 5 -z $srcdir/datasets/matio_test_cases_compressed_le.mat var73],[0],[],[])
 AT_CHECK([cp $srcdir/results/dump-var7x-3.out expout
           $builddir/../tools/matdump -d test_write_reshape32x32x32.mat var73\(2:30:end,4:50:end\)],[0],[expout],[])
 AT_CLEANUP
@@ -78,7 +78,7 @@ AT_CHECK([cp $srcdir/results/dump-var74-1.out expout
           $builddir/../tools/matdump -d $srcdir/datasets/matio_test_cases_compressed_le.mat var74\(2:3:end,4:5:end,8:16:end\)],[0],[expout],[])
 AT_CHECK([cp $srcdir/results/dump-var74-2.out expout
           $builddir/../tools/matdump -d $srcdir/datasets/matio_test_cases_compressed_le.mat var74\(30:1:32,27:1:29,25:1:26\)],[0],[expout],[])
-AT_CHECK([$builddir/test_mat reshape32x32x32 -v 5 -z $srcdir/datasets/matio_test_cases_compressed_le.mat var74], [0], [],[])
+AT_CHECK([$builddir/test_mat reshape32x32x32 -v 5 -z $srcdir/datasets/matio_test_cases_compressed_le.mat var74],[0],[],[])
 AT_CHECK([cp $srcdir/results/dump-var7x-3.out expout
           $builddir/../tools/matdump -d test_write_reshape32x32x32.mat var74\(2:30:end,4:50:end\)],[0],[expout],[])
 AT_CLEANUP
@@ -90,7 +90,7 @@ AT_CHECK([cp $srcdir/results/dump-var75-1.out expout
           $builddir/../tools/matdump -d $srcdir/datasets/matio_test_cases_compressed_le.mat var75\(2:3:end,4:5:end,8:16:end\)],[0],[expout],[])
 AT_CHECK([cp $srcdir/results/dump-var75-2.out expout
           $builddir/../tools/matdump -d $srcdir/datasets/matio_test_cases_compressed_le.mat var75\(30:1:32,27:1:29,25:1:26\)],[0],[expout],[])
-AT_CHECK([$builddir/test_mat reshape32x32x32 -v 5 -z $srcdir/datasets/matio_test_cases_compressed_le.mat var75], [0], [],[])
+AT_CHECK([$builddir/test_mat reshape32x32x32 -v 5 -z $srcdir/datasets/matio_test_cases_compressed_le.mat var75],[0],[],[])
 AT_CHECK([cp $srcdir/results/dump-var7x-3.out expout
           $builddir/../tools/matdump -d test_write_reshape32x32x32.mat var75\(2:30:end,4:50:end\)],[0],[expout],[])
 AT_CLEANUP
@@ -102,7 +102,7 @@ AT_CHECK([cp $srcdir/results/dump-var76-1.out expout
           $builddir/../tools/matdump -d $srcdir/datasets/matio_test_cases_compressed_le.mat var76\(2:3:end,4:5:end,8:16:end\)],[0],[expout],[])
 AT_CHECK([cp $srcdir/results/dump-var76-2.out expout
           $builddir/../tools/matdump -d $srcdir/datasets/matio_test_cases_compressed_le.mat var76\(30:1:32,27:1:29,25:1:26\)],[0],[expout],[])
-AT_CHECK([$builddir/test_mat reshape32x32x32 -v 5 -z $srcdir/datasets/matio_test_cases_compressed_le.mat var76], [0], [],[])
+AT_CHECK([$builddir/test_mat reshape32x32x32 -v 5 -z $srcdir/datasets/matio_test_cases_compressed_le.mat var76],[0],[],[])
 AT_CHECK([cp $srcdir/results/dump-var7x-3.out expout
           $builddir/../tools/matdump -d test_write_reshape32x32x32.mat var76\(2:30:end,4:50:end\)],[0],[expout],[])
 AT_CLEANUP
@@ -114,7 +114,7 @@ AT_CHECK([cp $srcdir/results/dump-var77-1.out expout
           $builddir/../tools/matdump -d $srcdir/datasets/matio_test_cases_compressed_le.mat var77\(2:3:end,4:5:end,8:16:end\)],[0],[expout],[])
 AT_CHECK([cp $srcdir/results/dump-var77-2.out expout
           $builddir/../tools/matdump -d $srcdir/datasets/matio_test_cases_compressed_le.mat var77\(30:1:32,27:1:29,25:1:26\)],[0],[expout],[])
-AT_CHECK([$builddir/test_mat reshape32x32x32 -v 5 -z $srcdir/datasets/matio_test_cases_compressed_le.mat var77], [0], [],[])
+AT_CHECK([$builddir/test_mat reshape32x32x32 -v 5 -z $srcdir/datasets/matio_test_cases_compressed_le.mat var77],[0],[],[])
 AT_CHECK([cp $srcdir/results/dump-var7x-3.out expout
           $builddir/../tools/matdump -d test_write_reshape32x32x32.mat var77\(2:30:end,4:50:end\)],[0],[expout],[])
 AT_CLEANUP
@@ -126,7 +126,7 @@ AT_CHECK([cp $srcdir/results/dump-var78-1.out expout
           $builddir/../tools/matdump -d $srcdir/datasets/matio_test_cases_compressed_le.mat var78\(2:3:end,4:5:end,8:16:end\)],[0],[expout],[])
 AT_CHECK([cp $srcdir/results/dump-var78-2.out expout
           $builddir/../tools/matdump -d $srcdir/datasets/matio_test_cases_compressed_le.mat var78\(30:1:32,27:1:29,25:1:26\)],[0],[expout],[])
-AT_CHECK([$builddir/test_mat reshape32x32x32 -v 5 -z $srcdir/datasets/matio_test_cases_compressed_le.mat var78], [0], [],[])
+AT_CHECK([$builddir/test_mat reshape32x32x32 -v 5 -z $srcdir/datasets/matio_test_cases_compressed_le.mat var78],[0],[],[])
 AT_CHECK([cp $srcdir/results/dump-var78-3.out expout
           $builddir/../tools/matdump -d test_write_reshape32x32x32.mat var78\(2:30:end,4:50:end\)],[0],[expout],[])
 AT_CLEANUP
@@ -138,7 +138,7 @@ AT_CHECK([cp $srcdir/results/dump-var79-1.out expout
           $builddir/../tools/matdump -d $srcdir/datasets/matio_test_cases_compressed_le.mat var79\(2:3:end,4:5:end,8:16:end\)],[0],[expout],[])
 AT_CHECK([cp $srcdir/results/dump-var79-2.out expout
           $builddir/../tools/matdump -d $srcdir/datasets/matio_test_cases_compressed_le.mat var79\(30:1:32,27:1:29,25:1:26\)],[0],[expout],[])
-AT_CHECK([$builddir/test_mat reshape32x32x32 -v 5 -z $srcdir/datasets/matio_test_cases_compressed_le.mat var79], [0], [],[])
+AT_CHECK([$builddir/test_mat reshape32x32x32 -v 5 -z $srcdir/datasets/matio_test_cases_compressed_le.mat var79],[0],[],[])
 AT_CHECK([cp $srcdir/results/dump-var79-3.out expout
           $builddir/../tools/matdump -d test_write_reshape32x32x32.mat var79\(2:30:end,4:50:end\)],[0],[expout],[])
 AT_CLEANUP
@@ -150,7 +150,7 @@ AT_CHECK([cp $srcdir/results/dump-var80-1.out expout
           $builddir/../tools/matdump -d $srcdir/datasets/matio_test_cases_compressed_le.mat var80\(2:3:end,4:5:end,8:16:end\)],[0],[expout],[])
 AT_CHECK([cp $srcdir/results/dump-var80-2.out expout
           $builddir/../tools/matdump -d $srcdir/datasets/matio_test_cases_compressed_le.mat var80\(30:1:32,27:1:29,25:1:26\)],[0],[expout],[])
-AT_CHECK([$builddir/test_mat reshape32x32x32 -v 5 -z $srcdir/datasets/matio_test_cases_compressed_le.mat var80], [0], [],[])
+AT_CHECK([$builddir/test_mat reshape32x32x32 -v 5 -z $srcdir/datasets/matio_test_cases_compressed_le.mat var80],[0],[],[])
 AT_CHECK([cp $srcdir/results/dump-var8x-3.out expout
           $builddir/../tools/matdump -d test_write_reshape32x32x32.mat var80\(2:30:end,4:50:end\)],[0],[expout],[])
 AT_CLEANUP
@@ -162,7 +162,7 @@ AT_CHECK([cp $srcdir/results/dump-var81-1.out expout
           $builddir/../tools/matdump -d $srcdir/datasets/matio_test_cases_compressed_le.mat var81\(2:3:end,4:5:end,8:16:end\)],[0],[expout],[])
 AT_CHECK([cp $srcdir/results/dump-var81-2.out expout
           $builddir/../tools/matdump -d $srcdir/datasets/matio_test_cases_compressed_le.mat var81\(30:1:32,27:1:29,25:1:26\)],[0],[expout],[])
-AT_CHECK([$builddir/test_mat reshape32x32x32 -v 5 -z $srcdir/datasets/matio_test_cases_compressed_le.mat var81], [0], [],[])
+AT_CHECK([$builddir/test_mat reshape32x32x32 -v 5 -z $srcdir/datasets/matio_test_cases_compressed_le.mat var81],[0],[],[])
 AT_CHECK([cp $srcdir/results/dump-var8x-3.out expout
           $builddir/../tools/matdump -d test_write_reshape32x32x32.mat var81\(2:30:end,4:50:end\)],[0],[expout],[])
 AT_CLEANUP
@@ -174,7 +174,7 @@ AT_CHECK([cp $srcdir/results/dump-var82-1.out expout
           $builddir/../tools/matdump -d $srcdir/datasets/matio_test_cases_compressed_le.mat var82\(2:3:end,4:5:end,8:16:end\)],[0],[expout],[])
 AT_CHECK([cp $srcdir/results/dump-var82-2.out expout
           $builddir/../tools/matdump -d $srcdir/datasets/matio_test_cases_compressed_le.mat var82\(30:1:32,27:1:29,25:1:26\)],[0],[expout],[])
-AT_CHECK([$builddir/test_mat reshape32x32x32 -v 5 -z $srcdir/datasets/matio_test_cases_compressed_le.mat var82], [0], [],[])
+AT_CHECK([$builddir/test_mat reshape32x32x32 -v 5 -z $srcdir/datasets/matio_test_cases_compressed_le.mat var82],[0],[],[])
 AT_CHECK([cp $srcdir/results/dump-var8x-3.out expout
           $builddir/../tools/matdump -d test_write_reshape32x32x32.mat var82\(2:30:end,4:50:end\)],[0],[expout],[])
 AT_CLEANUP
@@ -186,7 +186,7 @@ AT_CHECK([cp $srcdir/results/dump-var83-1.out expout
           $builddir/../tools/matdump -d $srcdir/datasets/matio_test_cases_compressed_le.mat var83\(2:3:end,4:5:end,8:16:end\)],[0],[expout],[])
 AT_CHECK([cp $srcdir/results/dump-var83-2.out expout
           $builddir/../tools/matdump -d $srcdir/datasets/matio_test_cases_compressed_le.mat var83\(30:1:32,27:1:29,25:1:26\)],[0],[expout],[])
-AT_CHECK([$builddir/test_mat reshape32x32x32 -v 5 -z $srcdir/datasets/matio_test_cases_compressed_le.mat var83], [0], [],[])
+AT_CHECK([$builddir/test_mat reshape32x32x32 -v 5 -z $srcdir/datasets/matio_test_cases_compressed_le.mat var83],[0],[],[])
 AT_CHECK([cp $srcdir/results/dump-var8x-3.out expout
           $builddir/../tools/matdump -d test_write_reshape32x32x32.mat var83\(2:30:end,4:50:end\)],[0],[expout],[])
 AT_CLEANUP
@@ -198,7 +198,7 @@ AT_CHECK([cp $srcdir/results/dump-var84-1.out expout
           $builddir/../tools/matdump -d $srcdir/datasets/matio_test_cases_compressed_le.mat var84\(2:3:end,4:5:end,8:16:end\)],[0],[expout],[])
 AT_CHECK([cp $srcdir/results/dump-var84-2.out expout
           $builddir/../tools/matdump -d $srcdir/datasets/matio_test_cases_compressed_le.mat var84\(30:1:32,27:1:29,25:1:26\)],[0],[expout],[])
-AT_CHECK([$builddir/test_mat reshape32x32x32 -v 5 -z $srcdir/datasets/matio_test_cases_compressed_le.mat var84], [0], [],[])
+AT_CHECK([$builddir/test_mat reshape32x32x32 -v 5 -z $srcdir/datasets/matio_test_cases_compressed_le.mat var84],[0],[],[])
 AT_CHECK([cp $srcdir/results/dump-var8x-3.out expout
           $builddir/../tools/matdump -d test_write_reshape32x32x32.mat var84\(2:30:end,4:50:end\)],[0],[expout],[])
 AT_CLEANUP
@@ -210,7 +210,7 @@ AT_CHECK([cp $srcdir/results/dump-var85-1.out expout
           $builddir/../tools/matdump -d $srcdir/datasets/matio_test_cases_compressed_le.mat var85\(2:3:end,4:5:end,8:16:end\)],[0],[expout],[])
 AT_CHECK([cp $srcdir/results/dump-var85-2.out expout
           $builddir/../tools/matdump -d $srcdir/datasets/matio_test_cases_compressed_le.mat var85\(30:1:32,27:1:29,25:1:26\)],[0],[expout],[])
-AT_CHECK([$builddir/test_mat reshape32x32x32 -v 5 -z $srcdir/datasets/matio_test_cases_compressed_le.mat var85], [0], [],[])
+AT_CHECK([$builddir/test_mat reshape32x32x32 -v 5 -z $srcdir/datasets/matio_test_cases_compressed_le.mat var85],[0],[],[])
 AT_CHECK([cp $srcdir/results/dump-var8x-3.out expout
           $builddir/../tools/matdump -d test_write_reshape32x32x32.mat var85\(2:30:end,4:50:end\)],[0],[expout],[])
 AT_CLEANUP
@@ -222,7 +222,7 @@ AT_CHECK([cp $srcdir/results/dump-var86-1.out expout
           $builddir/../tools/matdump -d $srcdir/datasets/matio_test_cases_compressed_le.mat var86\(2:3:end,4:5:end,8:16:end\)],[0],[expout],[])
 AT_CHECK([cp $srcdir/results/dump-var86-2.out expout
           $builddir/../tools/matdump -d $srcdir/datasets/matio_test_cases_compressed_le.mat var86\(30:1:32,27:1:29,25:1:26\)],[0],[expout],[])
-AT_CHECK([$builddir/test_mat reshape32x32x32 -v 5 -z $srcdir/datasets/matio_test_cases_compressed_le.mat var86], [0], [],[])
+AT_CHECK([$builddir/test_mat reshape32x32x32 -v 5 -z $srcdir/datasets/matio_test_cases_compressed_le.mat var86],[0],[],[])
 AT_CHECK([cp $srcdir/results/dump-var86-3.out expout
           $builddir/../tools/matdump -d test_write_reshape32x32x32.mat var86\(2:30:end,4:50:end\)],[0],[expout],[])
 AT_CLEANUP
@@ -234,7 +234,7 @@ AT_CHECK([cp $srcdir/results/dump-var87-1.out expout
           $builddir/../tools/matdump -d $srcdir/datasets/matio_test_cases_compressed_le.mat var87\(2:3:end,4:5:end,8:16:end\)],[0],[expout],[])
 AT_CHECK([cp $srcdir/results/dump-var87-2.out expout
           $builddir/../tools/matdump -d $srcdir/datasets/matio_test_cases_compressed_le.mat var87\(30:1:32,27:1:29,25:1:26\)],[0],[expout],[])
-AT_CHECK([$builddir/test_mat reshape32x32x32 -v 5 -z $srcdir/datasets/matio_test_cases_compressed_le.mat var87], [0], [],[])
+AT_CHECK([$builddir/test_mat reshape32x32x32 -v 5 -z $srcdir/datasets/matio_test_cases_compressed_le.mat var87],[0],[],[])
 AT_CHECK([cp $srcdir/results/dump-var87-3.out expout
           $builddir/../tools/matdump -d test_write_reshape32x32x32.mat var87\(2:30:end,4:50:end\)],[0],[expout],[])
 AT_CLEANUP
@@ -246,7 +246,7 @@ AT_CHECK([cp $srcdir/results/dump-var88-1.out expout
           $builddir/../tools/matdump -d $srcdir/datasets/matio_test_cases_compressed_le.mat var88\(2:3:end,4:5:end,8:16:end\)],[0],[expout],[])
 AT_CHECK([cp $srcdir/results/dump-var88-2.out expout
           $builddir/../tools/matdump -d $srcdir/datasets/matio_test_cases_compressed_le.mat var88\(30:1:32,27:1:29,25:1:26\)],[0],[expout],[])
-AT_CHECK([$builddir/test_mat reshape32x32x32 -v 5 -z $srcdir/datasets/matio_test_cases_compressed_le.mat var88], [0], [],[])
+AT_CHECK([$builddir/test_mat reshape32x32x32 -v 5 -z $srcdir/datasets/matio_test_cases_compressed_le.mat var88],[0],[],[])
 AT_CHECK([cp $srcdir/results/dump-var88-3.out expout
           $builddir/../tools/matdump -d test_write_reshape32x32x32.mat var88\(2:30:end,4:50:end\)],[0],[expout],[])
 AT_CLEANUP
@@ -258,7 +258,7 @@ AT_CHECK([cp $srcdir/results/dump-var89-1.out expout
           $builddir/../tools/matdump -d $srcdir/datasets/matio_test_cases_compressed_le.mat var89\(2:3:end,4:5:end,8:16:end\)],[0],[expout],[])
 AT_CHECK([cp $srcdir/results/dump-var89-2.out expout
           $builddir/../tools/matdump -d $srcdir/datasets/matio_test_cases_compressed_le.mat var89\(30:1:32,27:1:29,25:1:26\)],[0],[expout],[])
-AT_CHECK([$builddir/test_mat reshape32x32x32 -v 5 -z $srcdir/datasets/matio_test_cases_compressed_le.mat var89], [0], [],[])
+AT_CHECK([$builddir/test_mat reshape32x32x32 -v 5 -z $srcdir/datasets/matio_test_cases_compressed_le.mat var89],[0],[],[])
 AT_CHECK([cp $srcdir/results/dump-var89-3.out expout
           $builddir/../tools/matdump -d test_write_reshape32x32x32.mat var89\(2:30:end,4:50:end\)],[0],[expout],[])
 AT_CLEANUP
diff --git a/test/tests/mat5_compressed_readwrite.at b/test/tests/mat5_compressed_readwrite.at
index 5a3d38d3..de1bd845 100644
--- a/test/tests/mat5_compressed_readwrite.at
+++ b/test/tests/mat5_compressed_readwrite.at
@@ -27,137 +27,137 @@ AT_SETUP([Copy variables])
 AT_KEYWORDS([copy])
 AT_SKIP_IF([test $COMPRESSION_ZLIB -ne 1])
 AT_SKIP_IF([! grep -q "#define SIZEOF_VOID_P 4" $abs_top_builddir/src/matioConfig.h])
-AT_CHECK([$builddir/test_mat -v 5 -z copy $srcdir/datasets/matio_test_cases_compressed_le.mat],[0],[],[])
+AT_CHECK([$builddir/test_mat -v 5 -z -o test_mat5_compressed_copy.mat copy $srcdir/datasets/matio_test_cases_compressed_le.mat],[0],[],[])
 AT_CHECK([cp $srcdir/results/dump-mat_copy-5_32.out expout
-          $builddir/../tools/matdump -f whos -h -d test_mat_copy.mat],[0],[expout],[])
+          $builddir/../tools/matdump -f whos -h -d test_mat5_compressed_copy.mat],[0],[expout],[])
 AT_CLEANUP
 
 AT_SETUP([Copy variables])
 AT_KEYWORDS([copy])
 AT_SKIP_IF([test $COMPRESSION_ZLIB -ne 1])
 AT_SKIP_IF([! grep -q "#define SIZEOF_VOID_P 8" $abs_top_builddir/src/matioConfig.h])
-AT_CHECK([$builddir/test_mat -v 5 -z copy $srcdir/datasets/matio_test_cases_compressed_le.mat],[0],[],[])
+AT_CHECK([$builddir/test_mat -v 5 -z -o test_mat5_compressed_copy.mat copy $srcdir/datasets/matio_test_cases_compressed_le.mat],[0],[],[])
 AT_CHECK([cp $srcdir/results/dump-mat_copy-5.out expout
-          $builddir/../tools/matdump -f whos -h -d test_mat_copy.mat],[0],[expout],[])
+          $builddir/../tools/matdump -f whos -h -d test_mat5_compressed_copy.mat],[0],[expout],[])
 AT_CLEANUP
 
 AT_SETUP([Delete variables])
 AT_KEYWORDS([delete])
 AT_SKIP_IF([test $COMPRESSION_ZLIB -ne 1])
-AT_CHECK([$builddir/test_mat -v 5 -z copy $srcdir/datasets/matio_test_cases_compressed_le.mat],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var2],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var3],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var4],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var5],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var6],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var7],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var8],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var9],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var10],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var11],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var12],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var13],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var14],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var15],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var16],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var17],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var18],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var19],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var20],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var21],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var22],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var23],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var25],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var26],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var27],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var28],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var29],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var30],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var31],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var32],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var33],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var34],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var35],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var36],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var37],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var38],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var39],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var40],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var41],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var42],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var43],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var44],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var45],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var46],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var47],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var48],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var49],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var50],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var51],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var52],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var53],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var54],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var55],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var56],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var57],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var58],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var59],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var60],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var61],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var62],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var63],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var64],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var65],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var66],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var67],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var68],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var69],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var70],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var71],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var72],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var73],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var74],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var75],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var76],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var77],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var78],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var79],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var80],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var81],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var82],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var83],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var84],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var85],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var86],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var87],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var88],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var89],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var90],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var91],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var92],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var93],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var94],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var95],[0],[],[])
+AT_CHECK([$builddir/test_mat -v 5 -z -o test_mat5_compressed_delete.mat copy $srcdir/datasets/matio_test_cases_compressed_le.mat],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_compressed_delete.mat var2],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_compressed_delete.mat var3],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_compressed_delete.mat var4],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_compressed_delete.mat var5],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_compressed_delete.mat var6],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_compressed_delete.mat var7],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_compressed_delete.mat var8],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_compressed_delete.mat var9],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_compressed_delete.mat var10],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_compressed_delete.mat var11],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_compressed_delete.mat var12],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_compressed_delete.mat var13],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_compressed_delete.mat var14],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_compressed_delete.mat var15],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_compressed_delete.mat var16],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_compressed_delete.mat var17],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_compressed_delete.mat var18],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_compressed_delete.mat var19],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_compressed_delete.mat var20],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_compressed_delete.mat var21],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_compressed_delete.mat var22],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_compressed_delete.mat var23],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_compressed_delete.mat var25],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_compressed_delete.mat var26],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_compressed_delete.mat var27],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_compressed_delete.mat var28],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_compressed_delete.mat var29],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_compressed_delete.mat var30],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_compressed_delete.mat var31],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_compressed_delete.mat var32],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_compressed_delete.mat var33],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_compressed_delete.mat var34],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_compressed_delete.mat var35],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_compressed_delete.mat var36],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_compressed_delete.mat var37],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_compressed_delete.mat var38],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_compressed_delete.mat var39],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_compressed_delete.mat var40],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_compressed_delete.mat var41],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_compressed_delete.mat var42],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_compressed_delete.mat var43],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_compressed_delete.mat var44],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_compressed_delete.mat var45],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_compressed_delete.mat var46],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_compressed_delete.mat var47],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_compressed_delete.mat var48],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_compressed_delete.mat var49],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_compressed_delete.mat var50],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_compressed_delete.mat var51],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_compressed_delete.mat var52],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_compressed_delete.mat var53],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_compressed_delete.mat var54],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_compressed_delete.mat var55],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_compressed_delete.mat var56],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_compressed_delete.mat var57],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_compressed_delete.mat var58],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_compressed_delete.mat var59],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_compressed_delete.mat var60],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_compressed_delete.mat var61],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_compressed_delete.mat var62],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_compressed_delete.mat var63],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_compressed_delete.mat var64],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_compressed_delete.mat var65],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_compressed_delete.mat var66],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_compressed_delete.mat var67],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_compressed_delete.mat var68],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_compressed_delete.mat var69],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_compressed_delete.mat var70],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_compressed_delete.mat var71],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_compressed_delete.mat var72],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_compressed_delete.mat var73],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_compressed_delete.mat var74],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_compressed_delete.mat var75],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_compressed_delete.mat var76],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_compressed_delete.mat var77],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_compressed_delete.mat var78],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_compressed_delete.mat var79],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_compressed_delete.mat var80],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_compressed_delete.mat var81],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_compressed_delete.mat var82],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_compressed_delete.mat var83],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_compressed_delete.mat var84],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_compressed_delete.mat var85],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_compressed_delete.mat var86],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_compressed_delete.mat var87],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_compressed_delete.mat var88],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_compressed_delete.mat var89],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_compressed_delete.mat var90],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_compressed_delete.mat var91],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_compressed_delete.mat var92],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_compressed_delete.mat var93],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_compressed_delete.mat var94],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_compressed_delete.mat var95],[0],[],[])
 AT_CHECK([cp $srcdir/results/dump-mat_copy-partial.out expout
-          $builddir/../tools/matdump -f whos -h -d test_mat_copy.mat],[0],[expout],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var1],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var24],[0],[],[])
+          $builddir/../tools/matdump -f whos -h -d test_mat5_compressed_delete.mat],[0],[expout],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_compressed_delete.mat var1],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_compressed_delete.mat var24],[0],[],[])
 AT_CLEANUP
 
 AT_SETUP([Copy large struct])
 AT_KEYWORDS([copy large_struct])
 AT_SKIP_IF([test $COMPRESSION_ZLIB -ne 1])
 AT_SKIP_IF([! grep -q "#define SIZEOF_VOID_P 4" $abs_top_builddir/src/matioConfig.h])
-AT_CHECK([$builddir/test_mat -v 5 -z copy $srcdir/datasets/large_struct_compressed_le.mat],[0],[],[])
+AT_CHECK([$builddir/test_mat -v 5 -z -o test_mat5_compressed_copy_large.mat copy $srcdir/datasets/large_struct_compressed_le.mat],[0],[],[])
 AT_CHECK([cp $srcdir/results/dump-large_struct_compressed_32.out expout
-          $builddir/../tools/matdump -f whos -d test_mat_copy.mat],[0],[expout],[])
+          $builddir/../tools/matdump -f whos -d test_mat5_compressed_copy_large.mat],[0],[expout],[])
 AT_CLEANUP
 
 AT_SETUP([Copy large struct])
 AT_KEYWORDS([copy large_struct])
 AT_SKIP_IF([test $COMPRESSION_ZLIB -ne 1])
 AT_SKIP_IF([! grep -q "#define SIZEOF_VOID_P 8" $abs_top_builddir/src/matioConfig.h])
-AT_CHECK([$builddir/test_mat -v 5 -z copy $srcdir/datasets/large_struct_compressed_le.mat],[0],[],[])
+AT_CHECK([$builddir/test_mat -v 5 -z -o test_mat5_compressed_copy_large.mat copy $srcdir/datasets/large_struct_compressed_le.mat],[0],[],[])
 AT_CHECK([cp $srcdir/results/dump-large_struct_compressed.out expout
-          $builddir/../tools/matdump -f whos -d test_mat_copy.mat],[0],[expout],[])
+          $builddir/../tools/matdump -f whos -d test_mat5_compressed_copy_large.mat],[0],[expout],[])
 AT_CLEANUP
diff --git a/test/tests/mat5_uncompressed_extended_sparse.at b/test/tests/mat5_uncompressed_extended_sparse.at
index e2721569..5fa650d6 100644
--- a/test/tests/mat5_uncompressed_extended_sparse.at
+++ b/test/tests/mat5_uncompressed_extended_sparse.at
@@ -40,7 +40,7 @@ AT_CLEANUP
 
 AT_SETUP([Write 2D sparse uint64 array])
 AT_SKIP_IF([test $EXTENDED_SPARSE -ne 1])
-AT_SKIP_IF([test $HAVE_INT64 -eq 0])
+AT_SKIP_IF([test $HAVE_UINT64 -eq 0])
 AT_CHECK([$builddir/test_mat -v 5 -c uint64 write_sparse],[0],[],[])
 AT_CHECK([cp $srcdir/results/readvar-write_sparse-sparse_matrix-uint64.out expout
           $builddir/test_mat readvar test_write_sparse.mat sparse_matrix],[0],[expout],[])
@@ -105,7 +105,7 @@ AT_CLEANUP
 
 AT_SETUP([Write 2D sparse complex uint64 array])
 AT_SKIP_IF([test $EXTENDED_SPARSE -ne 1])
-AT_SKIP_IF([test $HAVE_INT64 -eq 0])
+AT_SKIP_IF([test $HAVE_UINT64 -eq 0])
 AT_CHECK([$builddir/test_mat -v 5 -c uint64 write_complex_sparse],[0],[],[])
 AT_CHECK([cp $srcdir/results/readvar-write_complex_sparse-sparse_matrix-uint64.out expout
           $builddir/test_mat readvar test_write_sparse_complex.mat sparse_matrix],[0],[expout],[])
diff --git a/test/tests/mat5_uncompressed_readwrite.at b/test/tests/mat5_uncompressed_readwrite.at
index 9a451643..576e7708 100644
--- a/test/tests/mat5_uncompressed_readwrite.at
+++ b/test/tests/mat5_uncompressed_readwrite.at
@@ -26,117 +26,117 @@
 AT_SETUP([Copy variables])
 AT_KEYWORDS([copy])
 AT_SKIP_IF([! grep -q "#define SIZEOF_VOID_P 4" $abs_top_builddir/src/matioConfig.h])
-AT_CHECK([$builddir/test_mat -v 5 copy $srcdir/datasets/matio_test_cases_uncompressed_le.mat],[0],[],[])
+AT_CHECK([$builddir/test_mat -v 5 -o test_mat5_uncompressed_copy.mat copy $srcdir/datasets/matio_test_cases_uncompressed_le.mat],[0],[],[])
 AT_CHECK([cp $srcdir/results/dump-mat_copy-5_32.out expout
-          $builddir/../tools/matdump -f whos -h -d test_mat_copy.mat],[0],[expout],[])
+          $builddir/../tools/matdump -f whos -h -d test_mat5_uncompressed_copy.mat],[0],[expout],[])
 AT_CLEANUP
 
 AT_SETUP([Copy variables])
 AT_KEYWORDS([copy])
 AT_SKIP_IF([! grep -q "#define SIZEOF_VOID_P 8" $abs_top_builddir/src/matioConfig.h])
-AT_CHECK([$builddir/test_mat -v 5 copy $srcdir/datasets/matio_test_cases_uncompressed_le.mat],[0],[],[])
+AT_CHECK([$builddir/test_mat -v 5 -o test_mat5_uncompressed_copy.mat copy $srcdir/datasets/matio_test_cases_uncompressed_le.mat],[0],[],[])
 AT_CHECK([cp $srcdir/results/dump-mat_copy-5.out expout
-          $builddir/../tools/matdump -f whos -h -d test_mat_copy.mat],[0],[expout],[])
+          $builddir/../tools/matdump -f whos -h -d test_mat5_uncompressed_copy.mat],[0],[expout],[])
 AT_CLEANUP
 
 AT_SETUP([Delete variables])
 AT_KEYWORDS([delete])
-AT_CHECK([$builddir/test_mat -v 5 copy $srcdir/datasets/matio_test_cases_uncompressed_le.mat],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var2],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var3],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var4],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var5],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var6],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var7],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var8],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var9],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var10],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var11],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var12],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var13],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var14],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var15],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var16],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var17],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var18],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var19],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var20],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var21],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var22],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var23],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var25],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var26],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var27],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var28],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var29],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var30],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var31],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var32],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var33],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var34],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var35],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var36],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var37],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var38],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var39],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var40],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var41],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var42],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var43],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var44],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var45],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var46],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var47],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var48],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var49],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var50],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var51],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var52],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var53],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var54],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var55],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var56],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var57],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var58],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var59],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var60],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var61],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var62],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var63],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var64],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var65],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var66],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var67],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var68],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var69],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var70],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var71],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var72],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var73],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var74],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var75],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var76],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var77],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var78],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var79],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var80],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var81],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var82],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var83],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var84],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var85],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var86],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var87],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var88],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var89],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var90],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var91],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var92],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var93],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var94],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var95],[0],[],[])
+AT_CHECK([$builddir/test_mat -v 5 -o test_mat5_uncompressed_delete.mat copy $srcdir/datasets/matio_test_cases_uncompressed_le.mat],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_uncompressed_delete.mat var2],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_uncompressed_delete.mat var3],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_uncompressed_delete.mat var4],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_uncompressed_delete.mat var5],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_uncompressed_delete.mat var6],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_uncompressed_delete.mat var7],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_uncompressed_delete.mat var8],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_uncompressed_delete.mat var9],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_uncompressed_delete.mat var10],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_uncompressed_delete.mat var11],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_uncompressed_delete.mat var12],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_uncompressed_delete.mat var13],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_uncompressed_delete.mat var14],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_uncompressed_delete.mat var15],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_uncompressed_delete.mat var16],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_uncompressed_delete.mat var17],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_uncompressed_delete.mat var18],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_uncompressed_delete.mat var19],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_uncompressed_delete.mat var20],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_uncompressed_delete.mat var21],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_uncompressed_delete.mat var22],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_uncompressed_delete.mat var23],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_uncompressed_delete.mat var25],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_uncompressed_delete.mat var26],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_uncompressed_delete.mat var27],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_uncompressed_delete.mat var28],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_uncompressed_delete.mat var29],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_uncompressed_delete.mat var30],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_uncompressed_delete.mat var31],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_uncompressed_delete.mat var32],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_uncompressed_delete.mat var33],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_uncompressed_delete.mat var34],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_uncompressed_delete.mat var35],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_uncompressed_delete.mat var36],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_uncompressed_delete.mat var37],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_uncompressed_delete.mat var38],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_uncompressed_delete.mat var39],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_uncompressed_delete.mat var40],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_uncompressed_delete.mat var41],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_uncompressed_delete.mat var42],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_uncompressed_delete.mat var43],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_uncompressed_delete.mat var44],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_uncompressed_delete.mat var45],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_uncompressed_delete.mat var46],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_uncompressed_delete.mat var47],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_uncompressed_delete.mat var48],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_uncompressed_delete.mat var49],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_uncompressed_delete.mat var50],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_uncompressed_delete.mat var51],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_uncompressed_delete.mat var52],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_uncompressed_delete.mat var53],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_uncompressed_delete.mat var54],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_uncompressed_delete.mat var55],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_uncompressed_delete.mat var56],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_uncompressed_delete.mat var57],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_uncompressed_delete.mat var58],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_uncompressed_delete.mat var59],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_uncompressed_delete.mat var60],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_uncompressed_delete.mat var61],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_uncompressed_delete.mat var62],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_uncompressed_delete.mat var63],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_uncompressed_delete.mat var64],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_uncompressed_delete.mat var65],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_uncompressed_delete.mat var66],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_uncompressed_delete.mat var67],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_uncompressed_delete.mat var68],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_uncompressed_delete.mat var69],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_uncompressed_delete.mat var70],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_uncompressed_delete.mat var71],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_uncompressed_delete.mat var72],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_uncompressed_delete.mat var73],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_uncompressed_delete.mat var74],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_uncompressed_delete.mat var75],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_uncompressed_delete.mat var76],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_uncompressed_delete.mat var77],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_uncompressed_delete.mat var78],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_uncompressed_delete.mat var79],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_uncompressed_delete.mat var80],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_uncompressed_delete.mat var81],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_uncompressed_delete.mat var82],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_uncompressed_delete.mat var83],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_uncompressed_delete.mat var84],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_uncompressed_delete.mat var85],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_uncompressed_delete.mat var86],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_uncompressed_delete.mat var87],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_uncompressed_delete.mat var88],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_uncompressed_delete.mat var89],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_uncompressed_delete.mat var90],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_uncompressed_delete.mat var91],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_uncompressed_delete.mat var92],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_uncompressed_delete.mat var93],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_uncompressed_delete.mat var94],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_uncompressed_delete.mat var95],[0],[],[])
 AT_CHECK([cp $srcdir/results/dump-mat_copy-partial.out expout
-          $builddir/../tools/matdump -f whos -h -d test_mat_copy.mat],[0],[expout],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var1],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var24],[0],[],[])
+          $builddir/../tools/matdump -f whos -h -d test_mat5_uncompressed_delete.mat],[0],[expout],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_uncompressed_delete.mat var1],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat5_uncompressed_delete.mat var24],[0],[],[])
 AT_CLEANUP
diff --git a/test/tests/mat73_compressed_extended_sparse.at b/test/tests/mat73_compressed_extended_sparse.at
index 5bb0fd21..b489ff5e 100644
--- a/test/tests/mat73_compressed_extended_sparse.at
+++ b/test/tests/mat73_compressed_extended_sparse.at
@@ -44,7 +44,7 @@ AT_CLEANUP
 
 AT_SETUP([Write 2D sparse uint64 array])
 AT_SKIP_IF([test $EXTENDED_SPARSE -ne 1])
-AT_SKIP_IF([test $HAVE_INT64 -eq 0])
+AT_SKIP_IF([test $HAVE_UINT64 -eq 0])
 AT_SKIP_IF([test $MAT73 -ne 1])
 AT_SKIP_IF([test $COMPRESSION_ZLIB -ne 1])
 AT_CHECK([$builddir/test_mat -v 7.3 -z -c uint64 write_sparse],[0],[],[])
@@ -127,7 +127,7 @@ AT_CLEANUP
 
 AT_SETUP([Write 2D sparse complex uint64 array])
 AT_SKIP_IF([test $EXTENDED_SPARSE -ne 1])
-AT_SKIP_IF([test $HAVE_INT64 -eq 0])
+AT_SKIP_IF([test $HAVE_UINT64 -eq 0])
 AT_SKIP_IF([test $MAT73 -ne 1])
 AT_SKIP_IF([test $COMPRESSION_ZLIB -ne 1])
 AT_CHECK([$builddir/test_mat -v 7.3 -z -c uint64 write_complex_sparse],[0],[],[])
diff --git a/test/tests/mat73_compressed_readwrite.at b/test/tests/mat73_compressed_readwrite.at
index 178bd97d..c72e1d2c 100644
--- a/test/tests/mat73_compressed_readwrite.at
+++ b/test/tests/mat73_compressed_readwrite.at
@@ -27,119 +27,119 @@ AT_SETUP([Copy variables])
 AT_KEYWORDS([copy])
 AT_SKIP_IF([test $MAT73 -ne 1])
 AT_SKIP_IF([! grep -q "#define SIZEOF_VOID_P 4" $abs_top_builddir/src/matioConfig.h])
-AT_CHECK([$builddir/test_mat -v 7.3 -z copy $srcdir/datasets/matio_test_cases_compressed_hdf_le.mat],[0],[],[])
+AT_CHECK([$builddir/test_mat -v 7.3 -z -o test_mat73_compressed_copy.mat copy $srcdir/datasets/matio_test_cases_compressed_hdf_le.mat],[0],[],[])
 AT_CHECK([cp $srcdir/results/dump-mat_copy-73_32.out expout
-          $builddir/../tools/matdump -f whos -h -d test_mat_copy.mat],[0],[expout],[])
+          $builddir/../tools/matdump -f whos -h -d test_mat73_compressed_copy.mat],[0],[expout],[])
 AT_CLEANUP
 
 AT_SETUP([Copy variables])
 AT_KEYWORDS([copy])
 AT_SKIP_IF([test $MAT73 -ne 1])
 AT_SKIP_IF([! grep -q "#define SIZEOF_VOID_P 8" $abs_top_builddir/src/matioConfig.h])
-AT_CHECK([$builddir/test_mat -v 7.3 -z copy $srcdir/datasets/matio_test_cases_compressed_hdf_le.mat],[0],[],[])
+AT_CHECK([$builddir/test_mat -v 7.3 -z -o test_mat73_compressed_copy.mat copy $srcdir/datasets/matio_test_cases_compressed_hdf_le.mat],[0],[],[])
 AT_CHECK([cp $srcdir/results/dump-mat_copy-73.out expout
-          $builddir/../tools/matdump -f whos -h -d test_mat_copy.mat],[0],[expout],[])
+          $builddir/../tools/matdump -f whos -h -d test_mat73_compressed_copy.mat],[0],[expout],[])
 AT_CLEANUP
 
 AT_SETUP([Delete variables])
 AT_KEYWORDS([delete])
 AT_SKIP_IF([test $MAT73 -ne 1])
-AT_CHECK([$builddir/test_mat -v 7.3 -z copy $srcdir/datasets/matio_test_cases_compressed_hdf_le.mat],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var2],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var3],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var4],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var5],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var6],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var7],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var8],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var9],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var10],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var11],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var12],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var13],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var14],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var15],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var16],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var17],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var18],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var19],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var20],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var21],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var22],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var23],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var25],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var26],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var27],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var28],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var29],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var30],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var31],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var32],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var33],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var34],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var35],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var36],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var37],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var38],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var39],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var40],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var41],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var42],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var43],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var44],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var45],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var46],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var47],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var48],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var49],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var50],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var51],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var52],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var53],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var54],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var55],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var56],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var57],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var58],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var59],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var60],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var61],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var62],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var63],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var64],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var65],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var66],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var67],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var68],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var69],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var70],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var71],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var72],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var73],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var74],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var75],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var76],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var77],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var78],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var79],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var80],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var81],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var82],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var83],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var84],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var85],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var86],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var87],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var88],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var89],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var90],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var91],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var92],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var93],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var94],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var95],[0],[],[])
+AT_CHECK([$builddir/test_mat -v 7.3 -z -o test_mat73_compressed_delete.mat copy $srcdir/datasets/matio_test_cases_compressed_hdf_le.mat],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_compressed_delete.mat var2],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_compressed_delete.mat var3],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_compressed_delete.mat var4],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_compressed_delete.mat var5],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_compressed_delete.mat var6],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_compressed_delete.mat var7],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_compressed_delete.mat var8],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_compressed_delete.mat var9],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_compressed_delete.mat var10],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_compressed_delete.mat var11],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_compressed_delete.mat var12],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_compressed_delete.mat var13],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_compressed_delete.mat var14],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_compressed_delete.mat var15],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_compressed_delete.mat var16],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_compressed_delete.mat var17],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_compressed_delete.mat var18],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_compressed_delete.mat var19],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_compressed_delete.mat var20],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_compressed_delete.mat var21],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_compressed_delete.mat var22],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_compressed_delete.mat var23],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_compressed_delete.mat var25],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_compressed_delete.mat var26],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_compressed_delete.mat var27],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_compressed_delete.mat var28],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_compressed_delete.mat var29],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_compressed_delete.mat var30],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_compressed_delete.mat var31],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_compressed_delete.mat var32],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_compressed_delete.mat var33],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_compressed_delete.mat var34],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_compressed_delete.mat var35],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_compressed_delete.mat var36],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_compressed_delete.mat var37],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_compressed_delete.mat var38],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_compressed_delete.mat var39],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_compressed_delete.mat var40],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_compressed_delete.mat var41],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_compressed_delete.mat var42],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_compressed_delete.mat var43],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_compressed_delete.mat var44],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_compressed_delete.mat var45],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_compressed_delete.mat var46],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_compressed_delete.mat var47],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_compressed_delete.mat var48],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_compressed_delete.mat var49],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_compressed_delete.mat var50],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_compressed_delete.mat var51],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_compressed_delete.mat var52],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_compressed_delete.mat var53],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_compressed_delete.mat var54],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_compressed_delete.mat var55],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_compressed_delete.mat var56],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_compressed_delete.mat var57],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_compressed_delete.mat var58],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_compressed_delete.mat var59],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_compressed_delete.mat var60],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_compressed_delete.mat var61],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_compressed_delete.mat var62],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_compressed_delete.mat var63],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_compressed_delete.mat var64],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_compressed_delete.mat var65],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_compressed_delete.mat var66],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_compressed_delete.mat var67],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_compressed_delete.mat var68],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_compressed_delete.mat var69],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_compressed_delete.mat var70],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_compressed_delete.mat var71],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_compressed_delete.mat var72],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_compressed_delete.mat var73],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_compressed_delete.mat var74],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_compressed_delete.mat var75],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_compressed_delete.mat var76],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_compressed_delete.mat var77],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_compressed_delete.mat var78],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_compressed_delete.mat var79],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_compressed_delete.mat var80],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_compressed_delete.mat var81],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_compressed_delete.mat var82],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_compressed_delete.mat var83],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_compressed_delete.mat var84],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_compressed_delete.mat var85],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_compressed_delete.mat var86],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_compressed_delete.mat var87],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_compressed_delete.mat var88],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_compressed_delete.mat var89],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_compressed_delete.mat var90],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_compressed_delete.mat var91],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_compressed_delete.mat var92],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_compressed_delete.mat var93],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_compressed_delete.mat var94],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_compressed_delete.mat var95],[0],[],[])
 AT_CHECK([cp $srcdir/results/dump-mat_copy-partial.out expout
-          $builddir/../tools/matdump -f whos -h -d test_mat_copy.mat],[0],[expout],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var1],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var24],[0],[],[])
+          $builddir/../tools/matdump -f whos -h -d test_mat73_compressed_delete.mat],[0],[expout],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_compressed_delete.mat var1],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_compressed_delete.mat var24],[0],[],[])
 AT_CLEANUP
diff --git a/test/tests/mat73_uncompressed_extended_sparse.at b/test/tests/mat73_uncompressed_extended_sparse.at
index d99aed77..3c37e2c8 100644
--- a/test/tests/mat73_uncompressed_extended_sparse.at
+++ b/test/tests/mat73_uncompressed_extended_sparse.at
@@ -42,7 +42,7 @@ AT_CLEANUP
 
 AT_SETUP([Write 2D sparse uint64 array])
 AT_SKIP_IF([test $EXTENDED_SPARSE -ne 1])
-AT_SKIP_IF([test $HAVE_INT64 -eq 0])
+AT_SKIP_IF([test $HAVE_UINT64 -eq 0])
 AT_SKIP_IF([test $MAT73 -ne 1])
 AT_CHECK([$builddir/test_mat -v 7.3 -c uint64 write_sparse],[0],[],[])
 AT_CHECK([cp $srcdir/results/readvar-write_sparse-sparse_matrix-uint64.out expout
@@ -107,7 +107,7 @@ AT_CLEANUP
 
 AT_SETUP([Write 2D sparse complex int64 array])
 AT_SKIP_IF([test $EXTENDED_SPARSE -ne 1])
-AT_SKIP_IF([test $HAVE_INT64 -eq 0])
+AT_SKIP_IF([test $HAVE_UINT64 -eq 0])
 AT_SKIP_IF([test $MAT73 -ne 1])
 AT_CHECK([$builddir/test_mat -v 7.3 -c int64 write_complex_sparse],[0],[],[])
 AT_CHECK([cp $srcdir/results/readvar-write_complex_sparse-sparse_matrix-int64.out expout
diff --git a/test/tests/mat73_uncompressed_read_le.at b/test/tests/mat73_uncompressed_read_le.at
index 7f275ceb..0d0ae66f 100644
--- a/test/tests/mat73_uncompressed_read_le.at
+++ b/test/tests/mat73_uncompressed_read_le.at
@@ -153,13 +153,6 @@ AT_CHECK([cp $srcdir/results/read-var90.out expout
          $builddir/test_mat readvar $srcdir/datasets/matio_test_cases_uncompressed_hdf_le.mat var90],[0],[expout],[])
 AT_CLEANUP
 
-AT_SETUP([Read 2D logical array])
-AT_CHECK([if test $MAT73 -ne 1;then exit 77;fi])
-AT_CHECK([cp $srcdir/results/read-var90.out expout
-         $builddir/test_mat readvar $srcdir/datasets/matio_test_cases_uncompressed_hdf_le.mat var90],[0],
-[expout], [])
-AT_CLEANUP
-
 AT_SETUP([Read sparse double array])
 AT_SKIP_IF([test $MAT73 -ne 1])
 AT_CHECK([cp $srcdir/results/read-var21.out expout
@@ -338,13 +331,6 @@ AT_CHECK([cp $srcdir/results/read-var91.out expout
          $builddir/test_mat readvar $srcdir/datasets/matio_test_cases_uncompressed_hdf_le.mat var91],[0],[expout],[])
 AT_CLEANUP
 
-AT_SETUP([Read struct with logical fields])
-AT_CHECK([if test $MAT73 -ne 1;then exit 77;fi])
-AT_CHECK([cp $srcdir/results/read-var91.out expout
-         $builddir/test_mat readvar $srcdir/datasets/matio_test_cases_uncompressed_hdf_le.mat var91],[0],
-[expout], [])
-AT_CLEANUP
-
 AT_SETUP([Read struct with sparse double fields])
 AT_SKIP_IF([test $MAT73 -ne 1])
 AT_CHECK([cp $srcdir/results/read-var48.out expout
diff --git a/test/tests/mat73_uncompressed_readwrite.at b/test/tests/mat73_uncompressed_readwrite.at
index 1ac43c8a..0ccb3e8f 100644
--- a/test/tests/mat73_uncompressed_readwrite.at
+++ b/test/tests/mat73_uncompressed_readwrite.at
@@ -28,119 +28,119 @@ AT_SETUP([Copy variables])
 AT_KEYWORDS([copy])
 AT_SKIP_IF([test $MAT73 -ne 1])
 AT_SKIP_IF([! grep -q "#define SIZEOF_VOID_P 4" $abs_top_builddir/src/matioConfig.h])
-AT_CHECK([$builddir/test_mat -v 7.3 copy $srcdir/datasets/matio_test_cases_uncompressed_hdf_le.mat],[0],[],[])
+AT_CHECK([$builddir/test_mat -v 7.3 -o test_mat73_uncompressed_copy.mat copy $srcdir/datasets/matio_test_cases_uncompressed_hdf_le.mat],[0],[],[])
 AT_CHECK([cp $srcdir/results/dump-mat_copy-73_32.out expout
-          $builddir/../tools/matdump -f whos -h -d test_mat_copy.mat],[0],[expout],[])
+          $builddir/../tools/matdump -f whos -h -d test_mat73_uncompressed_copy.mat],[0],[expout],[])
 AT_CLEANUP
 
 AT_SETUP([Copy variables])
 AT_KEYWORDS([copy])
 AT_SKIP_IF([test $MAT73 -ne 1])
 AT_SKIP_IF([! grep -q "#define SIZEOF_VOID_P 8" $abs_top_builddir/src/matioConfig.h])
-AT_CHECK([$builddir/test_mat -v 7.3 copy $srcdir/datasets/matio_test_cases_uncompressed_hdf_le.mat],[0],[],[])
+AT_CHECK([$builddir/test_mat -v 7.3 -o test_mat73_uncompressed_copy.mat copy $srcdir/datasets/matio_test_cases_uncompressed_hdf_le.mat],[0],[],[])
 AT_CHECK([cp $srcdir/results/dump-mat_copy-73.out expout
-          $builddir/../tools/matdump -f whos -h -d test_mat_copy.mat],[0],[expout],[])
+          $builddir/../tools/matdump -f whos -h -d test_mat73_uncompressed_copy.mat],[0],[expout],[])
 AT_CLEANUP
 
 AT_SETUP([Delete variables])
 AT_KEYWORDS([delete])
 AT_SKIP_IF([test $MAT73 -ne 1])
-AT_CHECK([$builddir/test_mat -v 7.3 copy $srcdir/datasets/matio_test_cases_uncompressed_hdf_le.mat],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var2],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var3],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var4],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var5],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var6],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var7],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var8],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var9],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var10],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var11],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var12],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var13],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var14],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var15],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var16],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var17],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var18],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var19],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var20],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var21],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var22],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var23],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var25],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var26],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var27],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var28],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var29],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var30],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var31],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var32],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var33],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var34],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var35],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var36],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var37],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var38],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var39],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var40],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var41],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var42],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var43],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var44],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var45],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var46],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var47],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var48],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var49],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var50],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var51],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var52],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var53],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var54],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var55],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var56],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var57],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var58],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var59],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var60],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var61],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var62],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var63],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var64],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var65],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var66],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var67],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var68],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var69],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var70],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var71],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var72],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var73],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var74],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var75],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var76],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var77],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var78],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var79],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var80],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var81],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var82],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var83],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var84],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var85],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var86],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var87],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var88],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var89],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var90],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var91],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var92],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var93],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var94],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var95],[0],[],[])
+AT_CHECK([$builddir/test_mat -v 7.3 -o test_mat73_uncompressed_delete.mat copy $srcdir/datasets/matio_test_cases_uncompressed_hdf_le.mat],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_uncompressed_delete.mat var2],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_uncompressed_delete.mat var3],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_uncompressed_delete.mat var4],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_uncompressed_delete.mat var5],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_uncompressed_delete.mat var6],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_uncompressed_delete.mat var7],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_uncompressed_delete.mat var8],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_uncompressed_delete.mat var9],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_uncompressed_delete.mat var10],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_uncompressed_delete.mat var11],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_uncompressed_delete.mat var12],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_uncompressed_delete.mat var13],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_uncompressed_delete.mat var14],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_uncompressed_delete.mat var15],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_uncompressed_delete.mat var16],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_uncompressed_delete.mat var17],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_uncompressed_delete.mat var18],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_uncompressed_delete.mat var19],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_uncompressed_delete.mat var20],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_uncompressed_delete.mat var21],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_uncompressed_delete.mat var22],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_uncompressed_delete.mat var23],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_uncompressed_delete.mat var25],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_uncompressed_delete.mat var26],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_uncompressed_delete.mat var27],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_uncompressed_delete.mat var28],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_uncompressed_delete.mat var29],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_uncompressed_delete.mat var30],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_uncompressed_delete.mat var31],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_uncompressed_delete.mat var32],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_uncompressed_delete.mat var33],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_uncompressed_delete.mat var34],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_uncompressed_delete.mat var35],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_uncompressed_delete.mat var36],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_uncompressed_delete.mat var37],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_uncompressed_delete.mat var38],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_uncompressed_delete.mat var39],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_uncompressed_delete.mat var40],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_uncompressed_delete.mat var41],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_uncompressed_delete.mat var42],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_uncompressed_delete.mat var43],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_uncompressed_delete.mat var44],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_uncompressed_delete.mat var45],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_uncompressed_delete.mat var46],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_uncompressed_delete.mat var47],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_uncompressed_delete.mat var48],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_uncompressed_delete.mat var49],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_uncompressed_delete.mat var50],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_uncompressed_delete.mat var51],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_uncompressed_delete.mat var52],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_uncompressed_delete.mat var53],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_uncompressed_delete.mat var54],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_uncompressed_delete.mat var55],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_uncompressed_delete.mat var56],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_uncompressed_delete.mat var57],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_uncompressed_delete.mat var58],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_uncompressed_delete.mat var59],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_uncompressed_delete.mat var60],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_uncompressed_delete.mat var61],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_uncompressed_delete.mat var62],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_uncompressed_delete.mat var63],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_uncompressed_delete.mat var64],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_uncompressed_delete.mat var65],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_uncompressed_delete.mat var66],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_uncompressed_delete.mat var67],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_uncompressed_delete.mat var68],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_uncompressed_delete.mat var69],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_uncompressed_delete.mat var70],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_uncompressed_delete.mat var71],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_uncompressed_delete.mat var72],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_uncompressed_delete.mat var73],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_uncompressed_delete.mat var74],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_uncompressed_delete.mat var75],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_uncompressed_delete.mat var76],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_uncompressed_delete.mat var77],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_uncompressed_delete.mat var78],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_uncompressed_delete.mat var79],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_uncompressed_delete.mat var80],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_uncompressed_delete.mat var81],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_uncompressed_delete.mat var82],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_uncompressed_delete.mat var83],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_uncompressed_delete.mat var84],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_uncompressed_delete.mat var85],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_uncompressed_delete.mat var86],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_uncompressed_delete.mat var87],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_uncompressed_delete.mat var88],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_uncompressed_delete.mat var89],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_uncompressed_delete.mat var90],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_uncompressed_delete.mat var91],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_uncompressed_delete.mat var92],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_uncompressed_delete.mat var93],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_uncompressed_delete.mat var94],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_uncompressed_delete.mat var95],[0],[],[])
 AT_CHECK([cp $srcdir/results/dump-mat_copy-partial.out expout
-          $builddir/../tools/matdump -f whos -h -d test_mat_copy.mat],[0],[expout],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var1],[0],[],[])
-AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var24],[0],[],[])
+          $builddir/../tools/matdump -f whos -h -d test_mat73_uncompressed_delete.mat],[0],[expout],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_uncompressed_delete.mat var1],[0],[],[])
+AT_CHECK([$builddir/test_mat delete test_mat73_uncompressed_delete.mat var24],[0],[],[])
 AT_CLEANUP
diff --git a/tools/matdump.c b/tools/matdump.c
index 2f44530d..cb18c61f 100644
--- a/tools/matdump.c
+++ b/tools/matdump.c
@@ -47,14 +47,12 @@ int rpl_snprintf(char *, size_t, const char *, ...);
 #define mat_snprintf snprintf
 #endif /* !HAVE_SNPRINTF */
 
-static const char *optstring = "df:hvHV";
-static struct option options[] = {{"data", no_argument, NULL, 'd'},
-                                  {"format", required_argument, NULL, 'f'},
-                                  {"human", no_argument, NULL, 'h'},
-                                  {"verbose", optional_argument, NULL, 'v'},
-                                  {"help", no_argument, NULL, 'H'},
-                                  {"version", no_argument, NULL, 'V'},
-                                  {NULL, 0, NULL, 0}};
+static const char *optstring = "df:hvo:HV";
+static struct option options[] = {
+    {"data", no_argument, NULL, 'd'},         {"format", required_argument, NULL, 'f'},
+    {"human", no_argument, NULL, 'h'},        {"verbose", optional_argument, NULL, 'v'},
+    {"help", no_argument, NULL, 'H'},         {"version", no_argument, NULL, 'V'},
+    {"output", required_argument, NULL, 'o'}, {NULL, 0, NULL, 0}};
 
 static const char *helpstr[] = {"",
                                 "Usage: matdump [OPTIONS] mat_file [var1 var2 ...]",
@@ -824,6 +822,14 @@ print_default(const matvar_t *matvar)
     }
 }
 
+static void
+redirect_output(const char *output)
+{
+    if ( output != NULL )
+        if ( freopen(output, "w", stdout) == NULL )
+            fprintf(stderr, "Unable to open %s for writing. Using stdout instead.", output);
+}
+
 int
 main(int argc, char *argv[])
 {
@@ -868,6 +874,9 @@ main(int argc, char *argv[])
             case 'v':
                 Mat_SetVerbose(1, 0);
                 break;
+            case 'o':
+                redirect_output(optarg);
+                break;
             case 'H':
                 Mat_Help(helpstr);
                 /* Note: Mat_Help() calls exit() */