Improving test to check nested directories, with type 'file'. Fixing the dx-upload-all-outputs to work correctly for this case