diff --git a/core/console b/core/console
index 9ee2d76..50e1afa 100755
--- a/core/console
+++ b/core/console
@@ -1,30 +1,28 @@
 #!/usr/bin/env php
 <?php
+
 /**
  * @file
- * Drupal's console.
+ * Contains the Drupal console.
  */
 
 $loader = require_once __DIR__ . '/vendor/autoload.php';
 
-use Drupal\Console\ConsoleCompilerPass;
+use Drupal\Core\Console\CompilerPass;
+use Drupal\Core\Console\ServicesFinder;
 use Drupal\Core\DependencyInjection\ContainerBuilder;
 use Drupal\Core\DependencyInjection\YamlFileLoader;
-use Drupal\Console\Discovery\DrupalConsoleServicesFinder;
 
 $container = new ContainerBuilder();
 $loader = new YamlFileLoader($container);
-$services_finder = new DrupalConsoleServicesFinder();
-
-$service_files = $services_finder->consoleServiceYamlFiles();
-foreach ($service_files as $file) {
+$services_finder = new ServicesFinder();
+foreach ($services_finder as $file) {
   $loader->load($file->getPathname());
 }
 
-$pass = new ConsoleCompilerPass();
+$pass = new CompilerPass();
 $container->addCompilerPass($pass);
 $container->compile();
 
-$app = $container->get('drupal_console_app');
-
+$app = $container->get('console.app');
 $app->run();
diff --git a/core/core.console.services.yml b/core/core.console.services.yml
index d379f47..6f70991 100644
--- a/core/core.console.services.yml
+++ b/core/core.console.services.yml
@@ -1,15 +1,22 @@
 parameters:
-    # Make the class a property so we can change it for testing.
-    drupal_console_app.class: Drupal\Console\DrupalConsoleApp
+  # Make the class a property so we can change it for testing.
+  console.app.class: Drupal\Core\Console\Application
 
 services:
-  drupal_console_app:
-    class: "%drupal_console_app.class%"
+  console.app:
+    class: "%console.app.class%"
+
+  console.bootstrap:
+    class: Drupal\Core\Console\Bootstrap
+
+  console.command.cache_clear:
+    class: Drupal\Core\Console\Command\ClearCache
+    arguments: ['@console.bootstrap']
     tags:
-      - { name: drupal_console }
+      - { name: console.command }
 
-  drupal_console.drupal_cron:
-    class: Drupal\Console\Command\DrupalCronCommand
+  console.command.run_cron:
+    class: Drupal\Core\Console\Command\RunCron
+    arguments: ['@console.bootstrap']
     tags:
-      - { name: drupal_console.command }
-      - { name: drupal_console }
+      - { name: console.command }
diff --git a/core/lib/Drupal/Console/Command/CommandBase.php b/core/lib/Drupal/Console/Command/CommandBase.php
deleted file mode 100644
index 9adf5c4..0000000
--- a/core/lib/Drupal/Console/Command/CommandBase.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains CommandBase.
- */
-
-namespace Drupal\Console\Command;
-
-use Symfony\Component\Console\Command\Command;
-
-/**
- * Base console command class for Drupal.
- *
- * Subclass this if you want your command to be a Drupal 8 console command.
- */
-abstract class CommandBase extends Command {
-
-}
diff --git a/core/lib/Drupal/Console/Command/CommandBootstrapBase.php b/core/lib/Drupal/Console/Command/CommandBootstrapBase.php
deleted file mode 100644
index b875a90..0000000
--- a/core/lib/Drupal/Console/Command/CommandBootstrapBase.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains CommandBootstrapBase.
- */
-
-namespace Drupal\Console\Command;
-
-use Drupal\Console\Command\CommandBase;
-use Drupal\Core\DrupalKernel;
-use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Input\InputOption;
-use Symfony\Component\HttpFoundation\Request;
-
-/**
- * Bootstrap Drupal so we can run a console command.
- *
- * Subclass this so you can write a command which requires a booted Drupal. If
- * your command does not require a booted Drupal, don't subclass this.
- *
- * It's very important that we don't bootstrap Drupal before the subclass asks
- * for it.
- */
-abstract class CommandBootstrapBase extends CommandBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function configure() {
-    $this
-      ->addOption(
-        'environment', 'e', InputOption::VALUE_REQUIRED, 'Kernel environment.', 'prod'
-    );
-    parent::configure();
-  }
-
-  /**
-   * Bootstrap Drupal enough so that we can run commands which require it.
-   *
-   * @param InputInterface $input
-   *   Command input object.
-   * @param OutputInterface $output
-   *   Command output object
-   *
-   * @returns DrupalKernel|FALSE
-   *   Booted kernel, or FALSE.
-   */
-  protected function bootstrap(InputInterface $input, OutputInterface $output, Request $request = \NULL) {
-    // This defaults to 'prod.'
-    $env = $input->getOption('environment');
-    try {
-      // This boot strategy ripped from drupal_handle_request().
-      require_once __DIR__ . '/../../../../includes/bootstrap.inc';
-      drupal_bootstrap(DRUPAL_BOOTSTRAP_CONFIGURATION);
-
-      $kernel = new DrupalKernel($env, \drupal_classloader(), TRUE);
-      $kernel->boot();
-
-      if (!$request) {
-        // Create a meaningful request object. We shouldn't really need this but
-        // Drupal complains if it's not present.
-        $request = Request::createFromGlobals();
-      }
-      $container = $kernel->getContainer();
-      $container->set('request', $request);
-
-      // Don't ask me why we need this voodo. It's in drupal_handle_request().
-      $container->get('request_stack')->push($request);
-
-      drupal_bootstrap(DRUPAL_BOOTSTRAP_CODE);
-      return $kernel;
-    }
-    catch (\Exception $e) {
-      $formatter = $this->getHelperSet()->get('formatter');
-      $error_messages = array(
-        'Insufficient Drupal to proceed.',
-        'This command requires a bootable Drupal installation.',
-      );
-      $formatted_block = $formatter->formatBlock($error_messages, 'error', TRUE);
-      $output->writeln($formatted_block);
-    }
-    return FALSE;
-  }
-
-}
diff --git a/core/lib/Drupal/Console/ConsoleCompilerPass.php b/core/lib/Drupal/Console/ConsoleCompilerPass.php
deleted file mode 100644
index dccbc80..0000000
--- a/core/lib/Drupal/Console/ConsoleCompilerPass.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\Console\CommandCompilerPass.
- */
-
-namespace Drupal\Console;
-
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
-use Symfony\Component\DependencyInjection\Reference;
-
-/**
- * Compile dependencies between the console app and commands we've discovered.
- *
- * If you are making a console command, you must tag it with
- * 'drupal_console.command' in order for it to be added to the console app.
- *
- * @code
- *   drupal_console.your_command:
- *     class: Name\Space\To\YourCommand
- *     tags:
- *       - { name: drupal_console.command }
- * @endcode
- */
-class ConsoleCompilerPass implements CompilerPassInterface {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function process(ContainerBuilder $container) {
-    // Grab all services tagged as console commands.
-    $tagged_services = $container->findTaggedServiceIds('drupal_console.command');
-    // Remove all services which aren't console-related. We don't want to
-    // instantiate any classes which have any dependencies other than those for
-    // console.
-/*    $services = $container->getServiceIds();
-    foreach ($services as $service) {
-      if (!in_array($service, array('service_container', 'drupal_console_app'))) {
-        if (!in_array($service, $tagged_services)) {
-          $container->removeDefinition($service);
-        }
-      }
-    }
-*/
-    // Tell the container to add these services to the console app.
-    $definition = $container->getDefinition('drupal_console_app');
-    foreach ($tagged_services as $id => $attributes) {
-      $definition->addMethodCall(
-        'add', array(new Reference($id))
-      );
-    }
-  }
-
-}
diff --git a/core/lib/Drupal/Console/Discovery/DrupalConsoleServicesFinder.php b/core/lib/Drupal/Console/Discovery/DrupalConsoleServicesFinder.php
deleted file mode 100644
index 189d1cf..0000000
--- a/core/lib/Drupal/Console/Discovery/DrupalConsoleServicesFinder.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-namespace Drupal\Console\Discovery;
-
-use Drupal\Core\Discovery\DrupalFinder;
-
-class DrupalConsoleServicesFinder extends DrupalFinder {
-
-  public function consoleServiceYamlFiles() {
-    $this
-      // Search in Drupal's special places.
-      ->inDrupalCore()
-      ->inContrib()
-      ->excludeVendor()
-      // Only files, no directories.
-      ->files()
-      // Don't try to look in forbidden places.
-      ->ignoreUnreadableDirs()
-      // Ignore .git directories.
-      ->ignoreVCS(TRUE);
-
-    // We want console service YAML files.
-    $this->name('*.console.services.yml');
-
-    return $this->getIterator();
-  }
-
-
-}
\ No newline at end of file
diff --git a/core/lib/Drupal/Console/DrupalConsoleApp.php b/core/lib/Drupal/Console/DrupalConsoleApp.php
deleted file mode 100644
index 2f2f301..0000000
--- a/core/lib/Drupal/Console/DrupalConsoleApp.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-
-/**
- * @file
- * Console application for Drupal.
- */
-
-namespace Drupal\Console;
-
-use Drupal\Core\Discovery\DrupalFinder;
-use Drupal\Component\Discovery\IsSubclassFilterIterator;
-use Drupal\Component\Discovery\FileClassResolver;
-use Symfony\Component\Console\Application;
-use Symfony\Component\Console\Input\InputOption;
-
-class DrupalConsoleApp extends Application {
-
-  /**
-   * Discover Command classes in the Drupal file system.
-   *
-   * The discovery process goes like this:
-   * - Search in Drupal core and contrib areas.
-   * - Look for files ending in *Command.php.
-   * - Check that they're subclasses of Drupal\Console\Command\CommandBase.
-   *
-   * Classes meeting these critera are loaded and added to the application.
-   *
-   * @param string $directory
-   *   Directory that is the Drupal root.
-   *
-   * @return \Drupal\Console\DrupalConsoleApp
-   *   For fluent interfaces.
-   */
-  public function discoverCommands($directory) {
-    $finder = new DrupalFinder($directory);
-
-    $finder
-      // Search in Drupal's special places.
-      ->inDrupalCore()
-      ->inContrib()
-      ->excludeVendor()
-      // Only files, no directories.
-      ->files()
-      // Don't try to look in forbidden places.
-      ->ignoreUnreadableDirs()
-      // Ignore .git directories.
-      ->ignoreVCS(TRUE);
-
-    // We want console service YAML files.
-    $finder->name('*.console.services.yml');
-
-    // We keep a class file resolver around so we can use it in both discovery
-    // and loading, since it stores what it has looked up.
-    $resolver = new FileClassResolver();
-
-    // Use IsSubclassFilterIterator to find classes which are subclasses of
-    // CommandBase.
-    $filter_iterator = new IsSubclassFilterIterator(
-      $finder->getIterator(),
-      'Drupal\\Console\\Command\\CommandBase',
-      $resolver
-    );
-
-    // Add the commands we found to the app.
-    foreach ($filter_iterator as $file) {
-      $class = $resolver->classInFile($file->getPathName());
-      $this->add(new $class());
-    }
-
-    return $this;
-  }
-
-}
diff --git a/core/lib/Drupal/Core/Console/Application.php b/core/lib/Drupal/Core/Console/Application.php
new file mode 100644
index 0000000..aa7deed
--- /dev/null
+++ b/core/lib/Drupal/Core/Console/Application.php
@@ -0,0 +1,21 @@
+<?php
+
+/**
+ * @file
+ * Console application for Drupal.
+ */
+
+namespace Drupal\Core\Console;
+
+use Symfony\Component\Console\Application as GenericApplication;
+
+class Application extends GenericApplication {
+
+  /**
+   * Constructs a new class instance.
+   */
+  public function __construct() {
+    parent::__construct('Drupal', \Drupal::VERSION);
+  }
+
+}
diff --git a/core/lib/Drupal/Core/Console/Bootstrap.php b/core/lib/Drupal/Core/Console/Bootstrap.php
new file mode 100644
index 0000000..e2d43b1
--- /dev/null
+++ b/core/lib/Drupal/Core/Console/Bootstrap.php
@@ -0,0 +1,58 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Core\Console\Bootstrap.
+ */
+
+namespace Drupal\Core\Console;
+
+use Drupal\Core\DrupalKernel;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\HttpFoundation\Request;
+
+/**
+ * Bootstrap Drupal so we can run a console command.
+ */
+class Bootstrap Implements BootstrapInterface {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function bootstrap(Command $command, InputInterface $input, OutputInterface $output, Request $request = NULL) {
+    $env = $input->getOption('environment');
+    try {
+      require_once __DIR__ . '/../../../includes/bootstrap.inc';
+      drupal_bootstrap(DRUPAL_BOOTSTRAP_CONFIGURATION);
+
+      $kernel = new DrupalKernel($env, \drupal_classloader(), TRUE);
+      $kernel->boot();
+
+      if (!$request) {
+        // Create a meaningful request object. We shouldn't really need this but
+        // Drupal complains if it's not present.
+        $request = Request::createFromGlobals();
+      }
+      $container = $kernel->getContainer();
+      $container->set('request', $request);
+      $container->get('request_stack')->push($request);
+
+      drupal_bootstrap(DRUPAL_BOOTSTRAP_CODE);
+      return $kernel;
+    }
+    catch (\Exception $e) {
+      /** @var \Symfony\Component\Console\Helper\FormatterHelper $formatter */
+      $formatter = $command->getHelperSet()->get('formatter');
+      $error_messages = array(
+        'Insufficient Drupal to proceed.',
+        'This command requires a bootable Drupal installation.',
+      );
+      $formatted_block = $formatter->formatBlock($error_messages, 'error', TRUE);
+      $output->writeln($formatted_block);
+    }
+    return FALSE;
+  }
+
+}
diff --git a/core/lib/Drupal/Core/Console/BootstrapInterface.php b/core/lib/Drupal/Core/Console/BootstrapInterface.php
new file mode 100644
index 0000000..6945de7
--- /dev/null
+++ b/core/lib/Drupal/Core/Console/BootstrapInterface.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Core\Console\BootstrapInterface.
+ */
+
+namespace Drupal\Core\Console;
+
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\HttpFoundation\Request;
+
+/**
+ * Defines a bootstrap service.
+ */
+interface BootstrapInterface {
+
+  /**
+   * Bootstraps Drupal.
+   *
+   * @param \Symfony\Component\Console\Command\Command $command
+   * @param \Symfony\Component\Console\Input\InputInterface $input
+   * @param \Symfony\Component\Console\Output\OutputInterface $output
+   * @param \Symfony\Component\HttpFoundation\Request $request
+   *
+   * @returns \Drupal\Core\DrupalKernelInterface|false
+   *   The booted kernel, or FALSE if the bootstrap failed.
+   */
+  public function bootstrap(Command $command, InputInterface $input, OutputInterface $output, Request $request = NULL);
+
+}
diff --git a/core/lib/Drupal/Core/Console/Command/ClearCache.php b/core/lib/Drupal/Core/Console/Command/ClearCache.php
new file mode 100644
index 0000000..f0daddb
--- /dev/null
+++ b/core/lib/Drupal/Core/Console/Command/ClearCache.php
@@ -0,0 +1,40 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Core\Console\Command\ClearCache.
+ */
+
+namespace Drupal\Core\Console\Command;
+
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+
+/**
+ * Clears all caches.
+ */
+class ClearCache extends CommandBootstrapBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function configure() {
+    parent::configure();
+    $this
+      ->setName('drupal:cache-clear')
+      ->setAliases(array('cc'))
+      ->setDescription('Clears all caches.');
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function execute(InputInterface $input, OutputInterface $output) {
+    $kernel = $this->bootstrap->bootstrap($this, $input, $output);
+    if ($kernel) {
+      drupal_flush_all_caches();
+      $output->writeln('<info>Caches cleared.</info>');
+    }
+  }
+
+}
diff --git a/core/lib/Drupal/Core/Console/Command/CommandBootstrapBase.php b/core/lib/Drupal/Core/Console/Command/CommandBootstrapBase.php
new file mode 100644
index 0000000..ec91fa8
--- /dev/null
+++ b/core/lib/Drupal/Core/Console/Command/CommandBootstrapBase.php
@@ -0,0 +1,53 @@
+<?php
+
+/**
+ * @file
+ * Contains CommandBootstrapBase.
+ */
+
+namespace Drupal\Core\Console\Command;
+
+use Drupal\Core\Console\BootstrapInterface;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputOption;
+
+/**
+ * Bootstraps Drupal so we can run a console command.
+ *
+ * Subclass this so you can write a command which requires a booted Drupal. If
+ * your command does not require a booted Drupal, don't subclass this.
+ *
+ * It's very important that we don't bootstrap Drupal before the subclass asks
+ * for it.
+ */
+abstract class CommandBootstrapBase extends Command {
+
+  /**
+   * The bootstrap service.
+   *
+   * @var \Drupal\Core\Console\BootstrapInterface
+   */
+  protected $bootstrap;
+
+  /**
+   * Constructs a new class instance.
+   *
+   * @param \Drupal\Core\Console\BootstrapInterface $bootstrap
+   */
+  public function __construct(BootstrapInterface $bootstrap) {
+    parent::__construct();
+    $this->bootstrap = $bootstrap;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function configure() {
+    parent::configure();
+    $this
+      ->addOption(
+        'environment', 'e', InputOption::VALUE_REQUIRED, 'Kernel environment.', 'prod'
+    );
+  }
+
+}
diff --git a/core/lib/Drupal/Console/Command/DrupalCronCommand.php b/core/lib/Drupal/Core/Console/Command/RunCron.php
similarity index 61%
rename from core/lib/Drupal/Console/Command/DrupalCronCommand.php
rename to core/lib/Drupal/Core/Console/Command/RunCron.php
index 58470e6..f47cedc 100644
--- a/core/lib/Drupal/Console/Command/DrupalCronCommand.php
+++ b/core/lib/Drupal/Core/Console/Command/RunCron.php
@@ -2,16 +2,18 @@
 
 /**
  * @file
- * Command class for drupal:cron.
+ * Contains \Drupal\Core\Console\Command\RunCron.
  */
 
-namespace Drupal\Console\Command;
+namespace Drupal\Core\Console\Command;
 
-use Drupal\Console\Command\CommandBootstrapBase;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
-class DrupalCronCommand extends CommandBootstrapBase {
+/**
+ * Runs cron from the console.
+ */
+class RunCron extends CommandBootstrapBase {
 
   /**
    * {@inheritdoc}
@@ -20,20 +22,21 @@ protected function configure() {
     parent::configure();
     $this
       ->setName('drupal:cron')
-      ->setDescription('Perform a cron run.');
+      ->setAliases(array('cron'))
+      ->setDescription('Performs a cron run.');
   }
 
   /**
    * {@inheritdoc}
    */
   protected function execute(InputInterface $input, OutputInterface $output) {
-    $kernel = $this->bootstrap($input, $output);
+    $kernel = $this->bootstrap->bootstrap($this, $input, $output);
     if ($kernel) {
       $output->writeln('<info>Running cron...</info>');
+      /** @var \Drupal\Core\CronInterface $cron */
       $cron = $kernel->getContainer()->get('cron');
       $cron->run();
       $output->writeln('<info>Done.</info>');
-      return;
     }
   }
 
diff --git a/core/lib/Drupal/Core/Console/CompilerPass.php b/core/lib/Drupal/Core/Console/CompilerPass.php
new file mode 100644
index 0000000..39fda13
--- /dev/null
+++ b/core/lib/Drupal/Core/Console/CompilerPass.php
@@ -0,0 +1,42 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Core\Console\CommandCompilerPass.
+ */
+
+namespace Drupal\Core\Console;
+
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\Reference;
+
+/**
+ * Compiles dependencies between the console app and commands we've discovered.
+ *
+ * If you are making a console command, you must tag it with
+ * 'console.command' in order for it to be added to the console app.
+ *
+ * @code
+ *   namespace.console.command_name:
+ *     class: Name\Space\To\YourCommand
+ *     tags:
+ *       - { name: console.command }
+ * @endcode
+ */
+class CompilerPass implements CompilerPassInterface {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function process(ContainerBuilder $container) {
+    $tagged_services = $container->findTaggedServiceIds('console.command');
+    $definition = $container->getDefinition('console.app');
+    foreach (array_keys($tagged_services) as $id) {
+      $definition->addMethodCall(
+        'add', array(new Reference($id))
+      );
+    }
+  }
+
+}
diff --git a/core/lib/Drupal/Core/Console/ServicesFinder.php b/core/lib/Drupal/Core/Console/ServicesFinder.php
new file mode 100644
index 0000000..7038b10
--- /dev/null
+++ b/core/lib/Drupal/Core/Console/ServicesFinder.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace Drupal\Core\Console;
+
+use Drupal\Core\Discovery\DrupalFinder;
+
+class ServicesFinder extends DrupalFinder {
+
+  /**
+   * Constructs a new class instance.
+   */
+  public function __construct() {
+    parent::__construct();
+    $this
+      ->inDrupalCore()
+      ->inContrib()
+      ->excludeVendor()
+      ->files()
+      ->ignoreUnreadableDirs()
+      ->ignoreVCS(TRUE)
+      ->name('*.console.services.yml');
+  }
+
+}
\ No newline at end of file
diff --git a/core/lib/Drupal/Core/Discovery/DrupalFinder.php b/core/lib/Drupal/Core/Discovery/DrupalFinder.php
index 016b0e5..9baf4a6 100644
--- a/core/lib/Drupal/Core/Discovery/DrupalFinder.php
+++ b/core/lib/Drupal/Core/Discovery/DrupalFinder.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\Core\Discovery\DrupalFinder.
+ * Contains \Drupal\Core\Discovery\DrupalFinder.
  */
 
 namespace Drupal\Core\Discovery;
@@ -10,87 +10,86 @@
 use Symfony\Component\Finder\Finder;
 
 /**
- * Drupal use-cases for Symfony's Finder component.
+ * Provides a finder with helpers for searching Drupal directories.
  */
 class DrupalFinder extends Finder {
 
-  protected $drupalRoot;
+  /**
+   * The path to the Drupal root directory.
+   *
+   * @var string
+   */
+  protected $drupalRoot = '';
 
   /**
-   * Constructor for DrupalFinder.
+   * Constructs a new class instance.
    *
    * @param string $drupal_root
    *   (optional) Path to initialize as the root of the Drupal installation.
-   *
-   * @todo: Come up with a way to avoid dirname().
    */
   public function __construct($drupal_root = NULL) {
     parent::__construct();
     if (!$drupal_root) {
-      $drupal_root = realpath(dirname(dirname(dirname(dirname(dirname(dirname(__FILE__)))))));
+      $drupal_root = __DIR__ . '/../../../../..';
     }
     $this->drupalRoot = $drupal_root;
   }
 
   /**
-   * Path to the root of the Drupal installation.
+   * Gets the path to the root of the Drupal installation.
    *
    * @return string
-   *   Path to the root of the Drupal installation.
+   *   The path to the root of the Drupal installation.
    */
-  public function drupalRoot() {
+  public function getDrupalRootPath() {
     return $this->drupalRoot;
   }
 
   /**
-   * Path to the Drupal installation's core directory.
+   * Gets the path to the Drupal installation's ./core directory.
    *
    * @return string
-   *   Path to the Drupal installation's core directory.
+   *   The path to the Drupal installation's core directory.
    */
-  public function drupalCore() {
-    return $this->drupalRoot . '/core';
+  public function getDrupalCorePath() {
+    return $this->getDrupalRootPath() . '/core';
   }
 
   /**
-   * Set iterator to search the Drupal root directory.
+   * Sets the iterator to search the Drupal root directory.
    *
-   * @return Drupal\Core\Discovery\DrupalFinder
-   *   Fluent interface.
+   * @return $this
    */
   public function inDrupalRoot() {
-    return $this->in($this->drupalRoot);
+    return $this->in($this->getDrupalRootPath());
   }
 
   /**
-   * Set iterator to search the Drupal core directory.
+   * Sets the iterator to search the Drupal core directory.
    *
-   * @return Drupal\Core\Discovery\DrupalFinder
-   *   Fluent interface.
+   * @return $this
    */
   public function inDrupalCore() {
-    return $this->in($this->drupalCore());
+    return $this->in($this->getDrupalCorePath());
   }
 
   /**
-   * Set iterator to search within Drupal's contrib directories.
+   * Sets the iterator to search within Drupal's contrib directories.
    *
-   * @return Drupal\Core\Discovery\DrupalFinder
-   *   Fluent interface.
+   * @return $this
    */
   public function inContrib() {
-    $this->in($this->drupalRoot . '/modules');
-    return $this->in($this->drupalRoot . '/sites');
+    $this->in($this->getDrupalRootPath() . '/modules');
+    return $this->in($this->getDrupalRootPath() . '/sites');
   }
 
   /**
-   * Set iterator to exclude Composer's vendor directory.
+   * Sets the iterator to exclude Composer's vendor directory.
    *
-   * @return Drupal\Core\Discovery\DrupalFinder
-   *   Fluent interface.
+   * @return $this
    */
   public function excludeVendor() {
-    return $this->exclude($this->drupalCore() . '/vendor');
+    return $this->exclude($this->getDrupalCorePath() . '/vendor');
   }
 
 }
diff --git a/core/lib/Drupal/Core/DrupalKernelInterface.php b/core/lib/Drupal/Core/DrupalKernelInterface.php
index 1e2ed07..a0c8140 100644
--- a/core/lib/Drupal/Core/DrupalKernelInterface.php
+++ b/core/lib/Drupal/Core/DrupalKernelInterface.php
@@ -49,7 +49,7 @@ public function getServiceProviders($origin);
   /**
    * Gets the current container.
    *
-   * @return ContainerInterface A ContainerInterface instance
+   * @return \Symfony\Component\DependencyInjection\ContainerInterface A ContainerInterface instance
    */
   public function getContainer();
 
diff --git a/core/tests/Drupal/Tests/Core/Console/ApplicationTest.php b/core/tests/Drupal/Tests/Core/Console/ApplicationTest.php
new file mode 100644
index 0000000..7b0ad8c
--- /dev/null
+++ b/core/tests/Drupal/Tests/Core/Console/ApplicationTest.php
@@ -0,0 +1,25 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\Core\Console\ApplicationTest.
+ */
+
+namespace Drupal\Tests\Core\Console;
+
+use Drupal\Core\Console\Application;
+use Drupal\Tests\UnitTestCase;
+
+/**
+ * @coversDefaultClass \Drupal\Core\Console\Application
+ */
+class ApplicationTest extends UnitTestCase {
+
+  /**
+   * @covers ::__construct
+   */
+  public function testConstruct() {
+    new Application();
+  }
+
+}
diff --git a/core/tests/Drupal/Tests/Core/Console/Command/ClearCacheTest.php b/core/tests/Drupal/Tests/Core/Console/Command/ClearCacheTest.php
new file mode 100644
index 0000000..4673263
--- /dev/null
+++ b/core/tests/Drupal/Tests/Core/Console/Command/ClearCacheTest.php
@@ -0,0 +1,77 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\Core\Console\Command\ClearCacheTest.
+ */
+
+namespace Drupal\Tests\Core\Console\Command {
+
+use Drupal\Core\Console\Command\ClearCache;
+use Drupal\Tests\UnitTestCase;
+
+/**
+ * @coversDefaultClass \Drupal\Core\Console\Command\ClearCache
+ */
+class ClearCacheTest extends UnitTestCase {
+
+  /**
+   * The bootstrap service.
+   *
+   * @var \Drupal\Core\Console\BootstrapInterface|\PHPUnit_Framework_MockObject_MockObject
+   */
+  protected $bootstrap;
+
+  /**
+   * The command under test.
+   *
+   * @var \Drupal\Core\Console\Command\ClearCache
+   */
+  protected $command;
+
+  /**
+   * {@inheritdoc}
+   *
+   * @covers ::__construct
+   * @covers ::configure
+   */
+  public function setUp() {
+    $this->bootstrap = $this->getMock('\Drupal\Core\Console\BootstrapInterface');
+
+    $this->command = new ClearCache($this->bootstrap);
+  }
+
+  /**
+   * @covers ::execute
+   */
+  public function testExecute() {
+    $input = $this->getMock('\Symfony\Component\Console\Input\InputInterface');
+
+    $output = $this->getMock('\Symfony\Component\Console\Output\OutputInterface');
+    $output->expects($this->atLeastOnce())
+      ->method('writeln');
+
+    $kernel = $this->getMock('\Drupal\Core\DrupalKernelInterface');
+
+    $this->bootstrap->expects($this->once())
+      ->method('bootstrap')
+      ->with($this->command, $input, $output)
+      ->will($this->returnValue($kernel));
+
+    $method = new \ReflectionMethod($this->command, 'execute');
+    $method->setAccessible(TRUE);
+    $method->invoke($this->command, $input, $output);
+  }
+
+}
+
+}
+
+namespace {
+
+if (!function_exists('drupal_flush_all_caches')) {
+  function drupal_flush_all_caches() {
+  }
+}
+
+}
diff --git a/core/tests/Drupal/Tests/Core/Console/Command/RunCronTest.php b/core/tests/Drupal/Tests/Core/Console/Command/RunCronTest.php
new file mode 100644
index 0000000..2848145
--- /dev/null
+++ b/core/tests/Drupal/Tests/Core/Console/Command/RunCronTest.php
@@ -0,0 +1,79 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\Core\Console\Command\RunCronTest.
+ */
+
+namespace Drupal\Tests\Core\Console\Command;
+
+use Drupal\Core\Console\Command\RunCron;
+use Drupal\Tests\UnitTestCase;
+
+/**
+ * @coversDefaultClass \Drupal\Core\Console\Command\RunCron
+ */
+class RunCronTest extends UnitTestCase {
+
+  /**
+   * The bootstrap service.
+   *
+   * @var \Drupal\Core\Console\BootstrapInterface|\PHPUnit_Framework_MockObject_MockObject
+   */
+  protected $bootstrap;
+
+  /**
+   * The command under test.
+   *
+   * @var \Drupal\Core\Console\Command\RunCron
+   */
+  protected $command;
+
+  /**
+   * {@inheritdoc}
+   *
+   * @covers ::__construct
+   * @covers ::configure
+   */
+  public function setUp() {
+    $this->bootstrap = $this->getMock('\Drupal\Core\Console\BootstrapInterface');
+
+    $this->command = new RunCron($this->bootstrap);
+  }
+
+  /**
+   * @covers ::execute
+   */
+  public function testExecute() {
+    $input = $this->getMock('\Symfony\Component\Console\Input\InputInterface');
+
+    $output = $this->getMock('\Symfony\Component\Console\Output\OutputInterface');
+    $output->expects($this->atLeastOnce())
+      ->method('writeln');
+
+    $cron = $this->getMock('\Drupal\Core\CronInterface');
+    $cron->expects($this->once())
+      ->method('run');
+
+    $container = $this->getMock('\Symfony\Component\DependencyInjection\ContainerInterface');
+    $container->expects($this->once())
+      ->method('get')
+      ->with('cron')
+      ->will($this->returnValue($cron));
+
+    $kernel = $this->getMock('\Drupal\Core\DrupalKernelInterface');
+    $kernel->expects($this->atLeastOnce())
+      ->method('getContainer')
+      ->will($this->returnValue($container));
+
+    $this->bootstrap->expects($this->once())
+      ->method('bootstrap')
+      ->with($this->command, $input, $output)
+      ->will($this->returnValue($kernel));
+
+    $method = new \ReflectionMethod($this->command, 'execute');
+    $method->setAccessible(TRUE);
+    $method->invoke($this->command, $input, $output);
+  }
+
+}
diff --git a/core/tests/Drupal/Tests/Core/Console/CompilerPassTest.php b/core/tests/Drupal/Tests/Core/Console/CompilerPassTest.php
new file mode 100644
index 0000000..e7442ee
--- /dev/null
+++ b/core/tests/Drupal/Tests/Core/Console/CompilerPassTest.php
@@ -0,0 +1,75 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\Core\Console\CompilerPassTest.
+ */
+
+namespace Drupal\Tests\Core\Console;
+
+use Drupal\Core\Console\CompilerPass;
+use Drupal\Tests\UnitTestCase;
+
+/**
+ * @coversDefaultClass \Drupal\Core\Console\CompilerPass
+ */
+class CompilerPassTest extends UnitTestCase {
+
+  /**
+   * The container builder service.
+   *
+   * @var \Symfony\Component\DependencyInjection\ContainerBuilder|\PHPUnit_Framework_MockObject_MockObject
+   */
+  protected $containerBuilder;
+
+  /**
+   * The compiler pass under test.
+   *
+   * @var \Drupal\Core\Console\CompilerPass
+   */
+  protected $command;
+
+  /**
+   * {@inheritdoc}
+   */
+  public function setUp() {
+    $this->command = new CompilerPass();
+  }
+
+  /**
+   * @covers ::process
+   */
+  public function testProcess() {
+    $service_ids = array($this->randomName(), $this->randomName());
+
+    $input = $this->getMock('\Symfony\Component\Console\Input\InputInterface');
+
+    $output = $this->getMock('\Symfony\Component\Console\Output\OutputInterface');
+    $output->expects($this->atLeastOnce())
+      ->method('writeln');
+
+    $definition = $this->getMockBuilder('\Symfony\Component\DependencyInjection\Definition')
+      ->disableOriginalConstructor()
+      ->getMock();
+    $definition->expects($this->exactly(count($service_ids)))
+      ->method('addMethodCall')
+      ->with('add', array($this->isInstanceOf('\Symfony\Component\DependencyInjection\Reference')));
+
+    $container_builder = $this->getMockBuilder('\Symfony\Component\DependencyInjection\ContainerBuilder')
+      ->disableOriginalConstructor()
+      ->getMock();
+    $container_builder->expects($this->once())
+      ->method('findTaggedServiceIds')
+      ->with('console.command')
+      ->will($this->returnValue(array_fill_keys($service_ids, array())));
+    $container_builder->expects($this->once())
+      ->method('getDefinition')
+      ->with('console.app')
+      ->will($this->returnValue($definition));
+
+    $method = new \ReflectionMethod($this->command, 'execute');
+    $method->setAccessible(TRUE);
+    $method->invoke($this->command, $input, $output);
+  }
+
+}
diff --git a/core/tests/Drupal/Tests/Core/Console/ServicesFinderTest.php b/core/tests/Drupal/Tests/Core/Console/ServicesFinderTest.php
new file mode 100644
index 0000000..47aac01
--- /dev/null
+++ b/core/tests/Drupal/Tests/Core/Console/ServicesFinderTest.php
@@ -0,0 +1,32 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\Core\Console\ServicesFinderTest.
+ */
+
+namespace Drupal\Tests\Core\Console;
+
+use Drupal\Core\Console\ServicesFinder;
+use Drupal\Tests\UnitTestCase;
+
+/**
+ * @coversDefaultClass \Drupal\Core\Console\ServicesFinder
+ */
+class ServicesFinderTest extends UnitTestCase {
+
+  /**
+   * @covers ::__construct
+   */
+  public function testConstruct() {
+    $finder = new ServicesFinder();
+    $files = array();
+    foreach ($finder as $file) {
+      /** @var \Symfony\Component\Finder\SplFileInfo $file */
+      $files[] = $file->getRealPath();
+      $this->assertFileExists($file->getRealPath());
+    }
+    $this->assertNotCount(0, $files);
+  }
+
+}
diff --git a/core/vendor/symfony/console/Symfony/Component/Console/Resources/bin/hiddeninput.exe b/core/vendor/symfony/console/Symfony/Component/Console/Resources/bin/hiddeninput.exe
index 9f4a2aa6357a7dd48f810a66982dc0f78a1c27f6..b59fd5b7935e856dc92af806dd500f9346b0e92a 100644
GIT binary patch
delta 10
Rcmez5{?UCx>Bh1eWdI;x1w8-&

delta 12
Tcmez9{>gnpDI@R3(i&v|Cy)h7