diff --git a/module/testtask/js/runcase.js b/module/testtask/js/runcase.js
index 9cd3df0e2b..43b373f6b9 100644
--- a/module/testtask/js/runcase.js
+++ b/module/testtask/js/runcase.js
@@ -20,10 +20,9 @@ function deleteFile(fileID)
 }
 
 /* Download a file, append the mouse to the link. Thus we call decide to open the file in browser no download it. */
-function downloadFile(fileID)
+function downloadFile(fileID, extension, imageWidth)
 {
     if(!fileID) return;
-    var sessionString = '<?php echo $sessionString;?>';
     var url = createLink('file', 'download', 'fileID=' + fileID + '&mouse=left') + sessionString;
     window.open(url, '_blank');
     return false;
diff --git a/module/testtask/model.php b/module/testtask/model.php
index 53d8934f02..f00360f992 100644
--- a/module/testtask/model.php
+++ b/module/testtask/model.php
@@ -424,18 +424,11 @@ class testtaskModel extends model
         }
 
         /* Create result of every step. */
-        if(isset($postData->steps) and $postData->steps)
+        foreach($postData->steps as $stepID =>$stepResult)
         {
-            foreach($postData->steps as $stepID =>$stepResult)
-            {
-                $step['result'] = $stepResult;
-                $step['real']   = $postData->reals[$stepID];
-                $stepResults[$stepID] = $step;
-            }
-        }
-        else
-        {
-            $stepResults = array();
+            $step['result'] = $stepResult;
+            $step['real']   = $postData->reals[$stepID];
+            $stepResults[$stepID] = $step;
         }
 
         /* Insert into testResult table. */
@@ -462,14 +455,7 @@ class testtaskModel extends model
         if(!dao::isError())
         {
             $resultID = $this->dao->lastInsertID();
-            if(!empty($stepResults))
-            {
-                foreach($stepResults as $stepID => $stepResult) $this->loadModel('file')->saveUpload('stepResult', $resultID, $stepID, "files{$stepID}", "labels{$stepID}");
-            }
-            else
-            {
-                $this->loadModel('file')->saveUpload('caseResult', $resultID);
-            }
+            foreach($stepResults as $stepID => $stepResult) $this->loadModel('file')->saveUpload('stepResult', $resultID, $stepID, "files{$stepID}", "labels{$stepID}");
         }
         $this->dao->update(TABLE_CASE)->set('lastRunner')->eq($this->app->user->account)->set('lastRunDate')->eq($now)->set('lastRunResult')->eq($caseResult)->where('id')->eq($postData->case)->exec();
 
@@ -488,6 +474,7 @@ class testtaskModel extends model
                     ->exec();
             }
         }
+        return $caseResult;
     }
 
     /**
@@ -520,18 +507,28 @@ class testtaskModel extends model
         foreach($postData->results as $caseID => $result)
         {
             $runID       = isset($runs[$caseID]) ? $runs[$caseID] : 0;
-            $dbSteps     = $stepGroups[$caseID];
-            $postSteps   = $postData->steps[$caseID];
+            $dbSteps     = isset($stepGroups[$caseID]) ? $stepGroups[$caseID] : array();
+            $postSteps   = isset($postData->steps[$caseID]) ? $postData->steps[$caseID] : array();
             $postReals   = $postData->reals[$caseID];
 
             $caseResult  = $result ? $result : 'pass';
             $stepResults = array();
-            foreach($dbSteps as $stepID => $step)
+            if($dbSteps)
+            {
+                foreach($dbSteps as $stepID => $step)
+                {
+                    $step           = array();
+                    $step['result'] = $caseResult == 'pass' ? $caseResult : $postSteps[$stepID];
+                    $step['real']   = $caseResult == 'pass' ? '' : $postReals[$stepID];
+                    $stepResults[$stepID] = $step;
+                }
+            }
+            else
             {
                 $step           = array();
-                $step['result'] = $caseResult == 'pass' ? $caseResult : $postSteps[$stepID];
-                $step['real']   = $caseResult == 'pass' ? '' : $postReals[$stepID];
-                $stepResults[$stepID] = $step;
+                $step['result'] = $caseResult;
+                $step['real']   = $caseResult == 'pass' ? '' : $postReals[0];
+                $stepResults[] = $step;
             }
 
             $result              = new stdClass();
diff --git a/module/testtask/view/batchrun.html.php b/module/testtask/view/batchrun.html.php
index 980a583bd3..96781a5933 100644
--- a/module/testtask/view/batchrun.html.php
+++ b/module/testtask/view/batchrun.html.php
@@ -53,7 +53,9 @@
           <?php $i++?>
           <?php endforeach?>
         </table>
-        <?php endif?>
+        <?php else:?>
+        <span class='hidden action<?php echo $caseID?>'><?php echo html::input("reals[$caseID][]", '', "class='form-control'");?></span>
+        <?php endif;?>
       </td>
     </tr>  
     <?php endforeach;?>
diff --git a/module/testtask/view/runcase.html.php b/module/testtask/view/runcase.html.php
index 9203f0964d..b139a1d42f 100644
--- a/module/testtask/view/runcase.html.php
+++ b/module/testtask/view/runcase.html.php
@@ -30,23 +30,28 @@
           <th class='w-p30'><?php  echo $lang->testcase->stepDesc;?></th>
           <th class='w-p30'><?php  echo $lang->testcase->stepExpect;?></th>
           <th class='w-100px'><?php echo $lang->testcase->result;?></th>
-          <th>
-            <?php echo $lang->testcase->real;?>
-            <?php if(empty($run->case->steps)):?>
-            <button type='button' class='btn btn-danger btn-file' data-toggle='modal' data-target='#fileModal'><?php echo $lang->testtask->files;?></button>
-            <?php endif;?>
-          </th>
+          <th><?php echo $lang->testcase->real;?></th>
         </tr>
       </thead>
+      <?php
+      if(empty($run->case->steps))
+      {
+          $step = new stdclass();
+          $step->id     = 0;
+          $step->case   = $run->case->id;
+          $step->desc   = '';
+          $step->expect = '';
+          $run->case->steps[] = $step;
+      }
+      ?>
       <?php foreach($run->case->steps as $key => $step):?>
-      <?php $defaultResult = $step->expect ? 'pass' : 'n/a';?>
       <tr>
         <th><?php echo $key + 1;?></th>
         <td><?php echo nl2br($step->desc);?></td>
         <td><?php echo nl2br($step->expect);?></td>
-        <td class='text-center'><?php echo html::select("steps[$step->id]", $lang->testcase->resultList, $defaultResult, "class='form-control'");?></td>
+        <td class='text-center'><?php echo html::select("steps[$step->id]", $lang->testcase->resultList, 'pass', "class='form-control'");?></td>
         <td>
-          <table class='fix-border fix-position'>
+          <table class='w-p100 fix-border fix-position'>
             <tr>
               <td><?php echo html::textarea("reals[$step->id]", '', "rows=1 class='form-control autosize'");?></td>
               <td><button type='button' title='<?php echo $lang->testtask->files?>' class='btn' data-toggle='modal' data-target='#fileModal<?php echo $step->id?>'><i class='icon icon-paper-clip'></i></button></td>
@@ -59,17 +64,8 @@
         <td colspan='5'>
           <?php
           if($preCase)  echo html::a(inlink('runCase', "runID={$preCase['runID']}&caseID={$preCase['caseID']}&version={$preCase['version']}"), $lang->testtask->pre, '', "id='pre' class='btn'");
-          if(empty($run->case->steps))
-          {
-              echo html::submitButton($lang->testtask->pass, "onclick=$('#result').val('pass')", 'btn btn-success');
-              echo html::submitButton($lang->testtask->fail, "onclick=$('#result').val('fail')", 'btn btn-danger');
-          }
-          else
-          {
-              echo html::submitButton();
-          }
+          echo html::submitButton();
           if($nextCase)  echo html::a(inlink('runCase', "runID={$nextCase['runID']}&caseID={$nextCase['caseID']}&version={$nextCase['version']}"), $lang->testtask->next, '', "id='next' class='btn'");
-          if(!$run->case->steps) echo html::hidden('result', '');
           echo html::hidden('case',    $run->case->id);
           echo html::hidden('version', $run->case->currentVersion);
           ?>
@@ -77,28 +73,6 @@
         </td>
       </tr>
     </table>
-    <?php if(empty($run->case->steps)):?>
-    <div class="modal fade" id="fileModal">
-      <div class="modal-dialog">
-        <div class="modal-content">
-          <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-            <h4 class="modal-title"><?php echo $lang->testtask->files;?></h4>
-          </div>
-          <div class="modal-body">
-            <table class='table table-form'>
-              <tr>
-                <td><?php echo $this->fetch('file', 'buildform');?></td>
-              </tr>
-              <tr>
-                <td class='text-center'><button type="button" class="btn btn-default" onclick='loadFilesName()' data-dismiss="modal" aria-hidden="true"><?php echo $lang->save;?></button></td>
-              <tr>
-            </table>
-          </div>
-        </div>
-      </div>
-    </div>
-    <?php else:?>
     <?php foreach($run->case->steps as $key => $step):?>
     <div class="modal fade" id="fileModal<?php echo $step->id;?>">
       <div class="modal-dialog">
@@ -121,7 +95,6 @@
       </div>
     </div>
     <?php endforeach;?>
-    <?php endif;?>
   </form>
 </div>
 <div class='main' id='resultsContainer'>
@@ -143,5 +116,10 @@ $(function()
         $('#casesResults table caption .result-tip').html($('#resultTip').html());
     });
 });
+<?php
+$sessionString  = $config->requestType == 'PATH_INFO' ? '?' : '&';
+$sessionString .= session_name() . '=' . session_id();
+?>
+var sessionString = '<?php echo $sessionString;?>';
 </script>
 <?php include '../../common/view/footer.lite.html.php';?>