diff --git a/core/includes/batch.inc b/core/includes/batch.inc
index 597ab43..49a4f2f 100644
--- a/core/includes/batch.inc
+++ b/core/includes/batch.inc
@@ -237,7 +237,7 @@ function _batch_process() {
     $finished = 1;
 
     if ($item = $queue->claimItem()) {
-      list($function, $args) = $item->data;
+      list($callable, $args) = $item->data;
 
       // Build the 'context' array and execute the function call.
       $batch_context = array(
@@ -246,7 +246,7 @@ function _batch_process() {
         'finished' => &$finished,
         'message'  => &$task_message,
       );
-      call_user_func_array($function, array_merge($args, array(&$batch_context)));
+      call_user_func_array($callable, array_merge($args, array(&$batch_context)));
 
       if ($finished >= 1) {
         // Make sure this step is not counted twice when computing $current.
@@ -377,10 +377,10 @@ function _batch_next_set() {
   if (isset($batch['sets'][$batch['current_set'] + 1])) {
     $batch['current_set']++;
     $current_set = &_batch_current_set();
-    if (isset($current_set['form_submit']) && ($function = $current_set['form_submit']) && is_callable($function)) {
+    if (isset($current_set['form_submit']) && ($callable = $current_set['form_submit']) && is_callable($callable)) {
       // We use our stored copies of $form and $form_state to account for
       // possible alterations by previous form submit handlers.
-      call_user_func_array($function, array($batch['form_state']['complete_form'], &$batch['form_state']));
+      call_user_func_array($callable, array($batch['form_state']['complete_form'], &$batch['form_state']));
     }
     return TRUE;
   }
@@ -402,7 +402,7 @@ function _batch_finished() {
       if (isset($batch_set['file']) && is_file($batch_set['file'])) {
         include_once DRUPAL_ROOT . '/' . $batch_set['file'];
       }
-      if (function_exists($batch_set['finished'])) {
+      if (is_callable($batch_set['finished'])) {
         $queue = _batch_queue($batch_set);
         $operations = $queue->getAllItems();
         $batch_set['finished']($batch_set['success'], $batch_set['results'], $operations, format_interval($batch_set['elapsed'] / 1000));
@@ -458,11 +458,11 @@ function _batch_finished() {
     if (!empty($_batch['form_state']['rebuild'])) {
       $_SESSION['batch_form_state'] = $_batch['form_state'];
     }
-    $function = $_batch['redirect_callback'];
-    if (function_exists($function)) {
-      $function($_batch['source_url'], array('query' => array('op' => 'finish', 'id' => $_batch['id'])));
+    $callable = $_batch['redirect_callback'];
+    if (is_callable($callable)) {
+      $callable($_batch['source_url'], array('query' => array('op' => 'finish', 'id' => $_batch['id'])));
     }
-    elseif ($function === NULL) {
+    elseif ($callable === NULL) {
       // Default to RedirectResponse objects when nothing specified.
       $url = url($_batch['source_url'], array(
         'absolute' => TRUE,
diff --git a/core/modules/block/custom_block/lib/Drupal/custom_block/Tests/CustomBlockSaveTest.php b/core/modules/block/custom_block/lib/Drupal/custom_block/Tests/CustomBlockSaveTest.php
index fda2798..ff0192e 100644
--- a/core/modules/block/custom_block/lib/Drupal/custom_block/Tests/CustomBlockSaveTest.php
+++ b/core/modules/block/custom_block/lib/Drupal/custom_block/Tests/CustomBlockSaveTest.php
@@ -49,13 +49,13 @@ public function testImport() {
     $max_id = db_query('SELECT MAX(id) FROM {custom_block}')->fetchField();
     $test_id = $max_id + mt_rand(1000, 1000000);
     $info = $this->randomName(8);
-    $block = array(
+    $block_array = array(
       'info' => $info,
-      'body' => array(Language::LANGCODE_NOT_SPECIFIED => array(array('value' => $this->randomName(32)))),
+      'body' => array('value' => $this->randomName(32)),
       'type' => 'basic',
       'id' => $test_id
     );
-    $block = entity_create('custom_block', $block);
+    $block = entity_create('custom_block', $block_array);
     $block->enforceIsNew(TRUE);
     $block->save();
 
@@ -65,6 +65,7 @@ public function testImport() {
     // Test the import saved.
     $block_by_id = custom_block_load($test_id);
     $this->assertTrue($block_by_id, 'Custom block load by block ID.');
+    $this->assertIdentical($block_by_id->body->value, $block_array['body']['value']);
   }
 
   /**