diff --git a/OpenBis.m b/OpenBis.m
index bd3c11606e320095eb09b0ee88ced1e5f9223782..0369de6d951172461da45976a29e7afbfae5a3bb 100644
--- a/OpenBis.m
+++ b/OpenBis.m
@@ -533,6 +533,10 @@ classdef OpenBis
             parse(p, obj, dataset, files, varargin{:});
             a = p.Results;
             
+            % ensure that files are passed as 1-N cell array (required for
+            % Matlab to Python conversion)
+            a.files = reshape(a.files, 1, numel(a.files));
+            
             dataset.download(pyargs('files', a.files, 'destination', a.destination, 'wait_until_finished', a.wait_until_finished, 'workers', int16(a.workers)));
             
             path_to_file = fullfile(a.destination, dataset.char, a.files);
diff --git a/obi_test.m b/obi_test.m
index 2a8c7c4e17c57429f505eb46d33c6effe7397486..aac6e880c8ad51f92dcf1f24b5fd07a5d7911737 100644
--- a/obi_test.m
+++ b/obi_test.m
@@ -84,24 +84,38 @@ catch
     rethrow(lasterror)
 end
 
-% delete the dummy files
-delete(file1);  delete(file2);
-
-
 
 %% 6. Download the created dataset
+try
+    files = obi.get_dataset_files(dataset);
+    file_list = files.pathInDataSet(files.fileSize>0);
+    destination = sprintf('temp_%d%d%d%d%d', randi(9,1,5));
+    path_to_files = obi.dataset_download(dataset, file_list, 'destination', destination, ...
+        'wait_until_finished', true);
+    fprintf('\n%s - Successfully downloaded Dataset with permId %s to folder %s\n', ...
+        datestr(clock,31), char(dataset.permId), destination)
+catch
+    disp('Could not download dataset')
+    rethrow(lasterror)
+end
 
 
 %% 7. Tear-down (delete everything, optional)
 if teardown
     fprintf('\n\n%s - Starting tear-down', datestr(clock,31))
-    % delete experiment
+    % delete the created local files
+    delete(file1);  delete(file2); rmdir(destination, 's');
+    fprintf('\n%s - Successfully deleted local files\n', datestr(clock,31))
+    
+    % delete openBIS experiment
     obi.delete_experiment(exp, 'created by Matlab-openBIS toolbox test function');
     fprintf('\n%s - Successfully deleted Experiment %s\n', datestr(clock,31), exp_name)
-    % delete project
+    
+    % delete openBIS project
     obi.delete_project(project_name, 'created by Matlab-openBIS toolbox test function');
     fprintf('\n%s - Successfully deleted Project %s\n', datestr(clock,31), project_name)
-    % delete space
+    
+    % delete openBIS space
     obi.delete_space(space, 'created by Matlab-openBIS toolbox test function');
     fprintf('\n%s - Successfully deleted Space %s\n', datestr(clock,31), space_name)
 end