@@ -48,7 +48,8 @@ class Codecept
         'colors' => false,
         'log' => true,
         'coverage' => false,
-	    'defer-flush' => false
+	    'defer-flush' => false,
+        'group' => null
     );
 
     public function __construct($options = array()) {
 
@@ -19,7 +19,8 @@ class Build extends Base
 // You can change it manually, but it will be overwritten on next build
 // @codingStandardsIgnoreFile
 
-use Codeception\Maybe;
+%s
+use \Codeception\Maybe;
 %s
 
 %s %s extends %s
@@ -166,13 +167,15 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $aliases[] = implode("\n",$inherited);
             $aliases[] = '*/';
 
+            $namespace = $this->getNamespaceString($suiteconf['namespace']);
 
             $contents = sprintf($this->template,
-	                            implode("\n", $aliases),
-	                            'class',
-	                            $settings['class_name'],
-	                            '\Codeception\AbstractGuy',
-	                            implode("\n\n ", $code));
+                $namespace,
+	            implode("\n", $aliases),
+	            'class',
+	            $settings['class_name'],
+	            '\Codeception\AbstractGuy',
+	            implode("\n\n ", $code));
 
             file_put_contents($file = $settings['path'].$settings['class_name'].'.php', $contents);
             $output->writeln("$file generated successfully. $methodCounter methods added");
 
@@ -11,7 +11,7 @@
 
 class GenerateCept extends Base
 {
-    protected $template  = "<?php\n\$I = new %s(\$scenario);\n\$I->wantTo('perform actions and see result');\n";
+    protected $template  = "<?php%s\n\$I = new %s(\$scenario);\n\$I->wantTo('perform actions and see result');\n";
 
     protected function configure()
     {
@@ -35,8 +35,10 @@ public function execute(InputInterface $input, OutputInterface $output)
         $config = \Codeception\Configuration::config($input->getOption('config'));
         $suiteconf = \Codeception\Configuration::suiteSettings($suite, $config);
 
+        $namespace = $this->getNamespaceString($suiteconf['namespace']);
+
         $guy = $suiteconf['class_name'];
-        $file = sprintf($this->template, $guy);
+        $file = sprintf($this->template, $namespace, $guy);
         $filename = $this->completeSuffix($filename, 'Cept');
         $this->buildPath($suiteconf['path'], $filename);
 
 
@@ -101,14 +101,16 @@ public static function suiteSettings($suite, $config)
         if (!in_array($suite, self::$suites)) throw new \Exception("Suite $suite was not loaded");
 
         $defaults = array(
+            'namespace' => null,
             'class_name' => 'NoGuy',
             'modules' => isset($config['modules']) ? $config['modules'] : array(),
             'bootstrap' => '_bootstrap.php',
             'suite_class' => '\PHPUnit_Framework_TestSuite',
             'colors' => true,
             'memory_limit' => '1024M',
             'path' => '',
-            'error_level' => 'E_ALL & ~E_STRICT & ~E_DEPRECATED'
+            'error_level' => 'E_ALL & ~E_STRICT & ~E_DEPRECATED',
+            'includes' => array()
         );
 
         $globalConf = $config['settings'];
 
@@ -29,16 +29,18 @@ class SuiteManager {
 
     protected $settings = array();
 
-    public function __construct(EventDispatcher $dispatcher, $name, $settings) {
+    public function __construct(EventDispatcher $dispatcher, $name, $settings)
+    {
         $this->settings = $settings;
         $this->dispatcher = $dispatcher;
         $this->suite = $this->createSuite($name);
         $this->path = $settings['path'];
-        if ($settings['bootstrap']) $this->settings['bootstrap'] = $this->path . $settings['bootstrap'];
 
+        if ($settings['bootstrap']) $this->settings['bootstrap'] = $this->path . $settings['bootstrap'];
         if (!file_exists($settings['path'] . $settings['class_name'].'.php')) {
             throw new Exception\Configuration($settings['class_name'] . " class doesn't exists in suite folder.\nRun the 'build' command to generate it");
         }
+
         require_once $settings['path'] . $settings['class_name'].'.php';
 
         $this->initializeModules($settings);
@@ -148,7 +150,8 @@ public function loadTest($path) {
 
     public function loadTests()
     {
-        $finder = Finder::create()->files()->sortByName()->in($this->path);
+        $dirs = array_merge($this->path, $this->settings['includes']);
+        $finder = Finder::create()->files()->sortByName()->in($dirs);
         $ceptFinder = clone($finder);
         $testFiles = $ceptFinder->name('*Cept.php');
         foreach ($testFiles as $test) {
 
@@ -1,4 +1,6 @@
 <?php
+namespace frontend;
+
 $I = new CliGuy($scenario);
 $I->wantTo('generate sample Cept');
 $I->amInPath('tests/data/sandbox');