diff --git a/app/Http/Controllers/AppController.php b/app/Http/Controllers/AppController.php
index 06268f45938c..703bd5fdd5b7 100644
--- a/app/Http/Controllers/AppController.php
+++ b/app/Http/Controllers/AppController.php
@@ -101,6 +101,7 @@ class AppController extends BaseController
         if (Industry::count() == 0) {
             Artisan::call('db:seed', array('--force' => true));
         }
+        Cache::flush();
         Artisan::call('optimize', array('--force' => true));
         
         $firstName = trim(Input::get('first_name'));
diff --git a/app/Http/Controllers/InvoiceController.php b/app/Http/Controllers/InvoiceController.php
index c469bade2ee0..b7e734ca14cd 100644
--- a/app/Http/Controllers/InvoiceController.php
+++ b/app/Http/Controllers/InvoiceController.php
@@ -326,6 +326,7 @@ class InvoiceController extends BaseController
         $actions[] = ['url' => 'javascript:onArchiveClick()', 'label' => trans("texts.archive_{$entityType}")];
         $actions[] = ['url' => 'javascript:onDeleteClick()', 'label' => trans("texts.delete_{$entityType}")];
 
+        $lastSent = ($invoice->is_recurring && $invoice->last_sent_date) ? $invoice->recurring_invoices->last() : null;
 
         $data = array(
                 'entityType' => $entityType,
@@ -336,9 +337,10 @@ class InvoiceController extends BaseController
                 'invitationContactIds' => $contactIds,
                 'url' => $url,
                 'title' => trans("texts.edit_{$entityType}"),
-                'client' => $invoice->client, 
+                'client' => $invoice->client,
                 'isRecurring' => $invoice->is_recurring,
-                'actions' => $actions);
+                'actions' => $actions,
+                'lastSent' => $lastSent);
         $data = array_merge($data, self::getViewModel());
 
         // Set the invitation link on the client's contacts
diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php
index dfd7a96470b3..25114f8d36aa 100644
--- a/app/Http/Controllers/ReportController.php
+++ b/app/Http/Controllers/ReportController.php
@@ -221,7 +221,8 @@ class ReportController extends BaseController
                     foreach ($period as $d)
                     {
                         $dateFormat = $groupBy == 'DAYOFYEAR' ? 'z' : ($groupBy == 'WEEK' ? 'W' : 'n');
-                        $date = $d->format('Y'.$dateFormat);
+                        // MySQL returns 1-366 for DAYOFYEAR, whereas PHP returns 0-365
+                        $date = $groupBy == 'DAYOFYEAR' ? $d->format('Y') . ($d->format($dateFormat) + 1) : $d->format('Y'.$dateFormat);
                         $totals[] = isset($data[$date]) ? $data[$date] : 0;
 
                         if ($entityType == ENTITY_INVOICE)
diff --git a/app/Http/routes.php b/app/Http/routes.php
index 0aa7e626fbab..ea6dca581ff0 100644
--- a/app/Http/routes.php
+++ b/app/Http/routes.php
@@ -219,227 +219,229 @@ Route::get('/forgot_password', function() {
 });
 
 
-define('CONTACT_EMAIL', Config::get('mail.from.address'));
-define('CONTACT_NAME', Config::get('mail.from.name'));
-define('SITE_URL', Config::get('app.url'));
+if (!defined('CONTACT_EMAIL')) {
+    define('CONTACT_EMAIL', Config::get('mail.from.address'));
+    define('CONTACT_NAME', Config::get('mail.from.name'));
+    define('SITE_URL', Config::get('app.url'));
 
-define('ENV_DEVELOPMENT', 'local');
-define('ENV_STAGING', 'staging');
-define('ENV_PRODUCTION', 'fortrabbit');
+    define('ENV_DEVELOPMENT', 'local');
+    define('ENV_STAGING', 'staging');
+    define('ENV_PRODUCTION', 'fortrabbit');
 
-define('RECENTLY_VIEWED', 'RECENTLY_VIEWED');
-define('ENTITY_CLIENT', 'client');
-define('ENTITY_INVOICE', 'invoice');
-define('ENTITY_RECURRING_INVOICE', 'recurring_invoice');
-define('ENTITY_PAYMENT', 'payment');
-define('ENTITY_CREDIT', 'credit');
-define('ENTITY_QUOTE', 'quote');
-define('ENTITY_TASK', 'task');
+    define('RECENTLY_VIEWED', 'RECENTLY_VIEWED');
+    define('ENTITY_CLIENT', 'client');
+    define('ENTITY_INVOICE', 'invoice');
+    define('ENTITY_RECURRING_INVOICE', 'recurring_invoice');
+    define('ENTITY_PAYMENT', 'payment');
+    define('ENTITY_CREDIT', 'credit');
+    define('ENTITY_QUOTE', 'quote');
+    define('ENTITY_TASK', 'task');
 
-define('PERSON_CONTACT', 'contact');
-define('PERSON_USER', 'user');
+    define('PERSON_CONTACT', 'contact');
+    define('PERSON_USER', 'user');
 
-define('ACCOUNT_DETAILS', 'details');
-define('ACCOUNT_NOTIFICATIONS', 'notifications');
-define('ACCOUNT_IMPORT_EXPORT', 'import_export');
-define('ACCOUNT_PAYMENTS', 'payments');
-define('ACCOUNT_MAP', 'import_map');
-define('ACCOUNT_EXPORT', 'export');
-define('ACCOUNT_PRODUCTS', 'products');
-define('ACCOUNT_ADVANCED_SETTINGS', 'advanced_settings');
-define('ACCOUNT_INVOICE_SETTINGS', 'invoice_settings');
-define('ACCOUNT_INVOICE_DESIGN', 'invoice_design');
-define('ACCOUNT_CHART_BUILDER', 'chart_builder');
-define('ACCOUNT_USER_MANAGEMENT', 'user_management');
-define('ACCOUNT_DATA_VISUALIZATIONS', 'data_visualizations');
-define('ACCOUNT_EMAIL_TEMPLATES', 'email_templates');
-define('ACCOUNT_TOKEN_MANAGEMENT', 'token_management');
-define('ACCOUNT_CUSTOMIZE_DESIGN', 'customize_design');
+    define('ACCOUNT_DETAILS', 'details');
+    define('ACCOUNT_NOTIFICATIONS', 'notifications');
+    define('ACCOUNT_IMPORT_EXPORT', 'import_export');
+    define('ACCOUNT_PAYMENTS', 'payments');
+    define('ACCOUNT_MAP', 'import_map');
+    define('ACCOUNT_EXPORT', 'export');
+    define('ACCOUNT_PRODUCTS', 'products');
+    define('ACCOUNT_ADVANCED_SETTINGS', 'advanced_settings');
+    define('ACCOUNT_INVOICE_SETTINGS', 'invoice_settings');
+    define('ACCOUNT_INVOICE_DESIGN', 'invoice_design');
+    define('ACCOUNT_CHART_BUILDER', 'chart_builder');
+    define('ACCOUNT_USER_MANAGEMENT', 'user_management');
+    define('ACCOUNT_DATA_VISUALIZATIONS', 'data_visualizations');
+    define('ACCOUNT_EMAIL_TEMPLATES', 'email_templates');
+    define('ACCOUNT_TOKEN_MANAGEMENT', 'token_management');
+    define('ACCOUNT_CUSTOMIZE_DESIGN', 'customize_design');
 
 
-define('ACTIVITY_TYPE_CREATE_CLIENT', 1);
-define('ACTIVITY_TYPE_ARCHIVE_CLIENT', 2);
-define('ACTIVITY_TYPE_DELETE_CLIENT', 3);
+    define('ACTIVITY_TYPE_CREATE_CLIENT', 1);
+    define('ACTIVITY_TYPE_ARCHIVE_CLIENT', 2);
+    define('ACTIVITY_TYPE_DELETE_CLIENT', 3);
 
-define('ACTIVITY_TYPE_CREATE_INVOICE', 4);
-define('ACTIVITY_TYPE_UPDATE_INVOICE', 5);
-define('ACTIVITY_TYPE_EMAIL_INVOICE', 6);
-define('ACTIVITY_TYPE_VIEW_INVOICE', 7);
-define('ACTIVITY_TYPE_ARCHIVE_INVOICE', 8);
-define('ACTIVITY_TYPE_DELETE_INVOICE', 9);
+    define('ACTIVITY_TYPE_CREATE_INVOICE', 4);
+    define('ACTIVITY_TYPE_UPDATE_INVOICE', 5);
+    define('ACTIVITY_TYPE_EMAIL_INVOICE', 6);
+    define('ACTIVITY_TYPE_VIEW_INVOICE', 7);
+    define('ACTIVITY_TYPE_ARCHIVE_INVOICE', 8);
+    define('ACTIVITY_TYPE_DELETE_INVOICE', 9);
 
-define('ACTIVITY_TYPE_CREATE_PAYMENT', 10);
-define('ACTIVITY_TYPE_UPDATE_PAYMENT', 11);
-define('ACTIVITY_TYPE_ARCHIVE_PAYMENT', 12);
-define('ACTIVITY_TYPE_DELETE_PAYMENT', 13);
+    define('ACTIVITY_TYPE_CREATE_PAYMENT', 10);
+    define('ACTIVITY_TYPE_UPDATE_PAYMENT', 11);
+    define('ACTIVITY_TYPE_ARCHIVE_PAYMENT', 12);
+    define('ACTIVITY_TYPE_DELETE_PAYMENT', 13);
 
-define('ACTIVITY_TYPE_CREATE_CREDIT', 14);
-define('ACTIVITY_TYPE_UPDATE_CREDIT', 15);
-define('ACTIVITY_TYPE_ARCHIVE_CREDIT', 16);
-define('ACTIVITY_TYPE_DELETE_CREDIT', 17);
+    define('ACTIVITY_TYPE_CREATE_CREDIT', 14);
+    define('ACTIVITY_TYPE_UPDATE_CREDIT', 15);
+    define('ACTIVITY_TYPE_ARCHIVE_CREDIT', 16);
+    define('ACTIVITY_TYPE_DELETE_CREDIT', 17);
 
-define('ACTIVITY_TYPE_CREATE_QUOTE', 18);
-define('ACTIVITY_TYPE_UPDATE_QUOTE', 19);
-define('ACTIVITY_TYPE_EMAIL_QUOTE', 20);
-define('ACTIVITY_TYPE_VIEW_QUOTE', 21);
-define('ACTIVITY_TYPE_ARCHIVE_QUOTE', 22);
-define('ACTIVITY_TYPE_DELETE_QUOTE', 23);
+    define('ACTIVITY_TYPE_CREATE_QUOTE', 18);
+    define('ACTIVITY_TYPE_UPDATE_QUOTE', 19);
+    define('ACTIVITY_TYPE_EMAIL_QUOTE', 20);
+    define('ACTIVITY_TYPE_VIEW_QUOTE', 21);
+    define('ACTIVITY_TYPE_ARCHIVE_QUOTE', 22);
+    define('ACTIVITY_TYPE_DELETE_QUOTE', 23);
 
-define('ACTIVITY_TYPE_RESTORE_QUOTE', 24);
-define('ACTIVITY_TYPE_RESTORE_INVOICE', 25);
-define('ACTIVITY_TYPE_RESTORE_CLIENT', 26);
-define('ACTIVITY_TYPE_RESTORE_PAYMENT', 27);
-define('ACTIVITY_TYPE_RESTORE_CREDIT', 28);
-define('ACTIVITY_TYPE_APPROVE_QUOTE', 29);
+    define('ACTIVITY_TYPE_RESTORE_QUOTE', 24);
+    define('ACTIVITY_TYPE_RESTORE_INVOICE', 25);
+    define('ACTIVITY_TYPE_RESTORE_CLIENT', 26);
+    define('ACTIVITY_TYPE_RESTORE_PAYMENT', 27);
+    define('ACTIVITY_TYPE_RESTORE_CREDIT', 28);
+    define('ACTIVITY_TYPE_APPROVE_QUOTE', 29);
 
-define('DEFAULT_INVOICE_NUMBER', '0001');
-define('RECENTLY_VIEWED_LIMIT', 8);
-define('LOGGED_ERROR_LIMIT', 100);
-define('RANDOM_KEY_LENGTH', 32);
-define('MAX_NUM_CLIENTS', 500);
-define('MAX_NUM_CLIENTS_PRO', 20000);
-define('MAX_NUM_USERS', 20);
-define('MAX_SUBDOMAIN_LENGTH', 30);
-define('DEFAULT_FONT_SIZE', 9);
+    define('DEFAULT_INVOICE_NUMBER', '0001');
+    define('RECENTLY_VIEWED_LIMIT', 8);
+    define('LOGGED_ERROR_LIMIT', 100);
+    define('RANDOM_KEY_LENGTH', 32);
+    define('MAX_NUM_CLIENTS', 500);
+    define('MAX_NUM_CLIENTS_PRO', 20000);
+    define('MAX_NUM_USERS', 20);
+    define('MAX_SUBDOMAIN_LENGTH', 30);
+    define('DEFAULT_FONT_SIZE', 9);
 
-define('INVOICE_STATUS_DRAFT', 1);
-define('INVOICE_STATUS_SENT', 2);
-define('INVOICE_STATUS_VIEWED', 3);
-define('INVOICE_STATUS_PARTIAL', 4);
-define('INVOICE_STATUS_PAID', 5);
+    define('INVOICE_STATUS_DRAFT', 1);
+    define('INVOICE_STATUS_SENT', 2);
+    define('INVOICE_STATUS_VIEWED', 3);
+    define('INVOICE_STATUS_PARTIAL', 4);
+    define('INVOICE_STATUS_PAID', 5);
 
-define('PAYMENT_TYPE_CREDIT', 1);
-define('CUSTOM_DESIGN', 11);
+    define('PAYMENT_TYPE_CREDIT', 1);
+    define('CUSTOM_DESIGN', 11);
 
-define('FREQUENCY_WEEKLY', 1);
-define('FREQUENCY_TWO_WEEKS', 2);
-define('FREQUENCY_FOUR_WEEKS', 3);
-define('FREQUENCY_MONTHLY', 4);
-define('FREQUENCY_THREE_MONTHS', 5);
-define('FREQUENCY_SIX_MONTHS', 6);
-define('FREQUENCY_ANNUALLY', 7);
+    define('FREQUENCY_WEEKLY', 1);
+    define('FREQUENCY_TWO_WEEKS', 2);
+    define('FREQUENCY_FOUR_WEEKS', 3);
+    define('FREQUENCY_MONTHLY', 4);
+    define('FREQUENCY_THREE_MONTHS', 5);
+    define('FREQUENCY_SIX_MONTHS', 6);
+    define('FREQUENCY_ANNUALLY', 7);
 
-define('SESSION_TIMEZONE', 'timezone');
-define('SESSION_CURRENCY', 'currency');
-define('SESSION_DATE_FORMAT', 'dateFormat');
-define('SESSION_DATE_PICKER_FORMAT', 'datePickerFormat');
-define('SESSION_DATETIME_FORMAT', 'datetimeFormat');
-define('SESSION_COUNTER', 'sessionCounter');
-define('SESSION_LOCALE', 'sessionLocale');
-define('SESSION_USER_ACCOUNTS', 'userAccounts');
+    define('SESSION_TIMEZONE', 'timezone');
+    define('SESSION_CURRENCY', 'currency');
+    define('SESSION_DATE_FORMAT', 'dateFormat');
+    define('SESSION_DATE_PICKER_FORMAT', 'datePickerFormat');
+    define('SESSION_DATETIME_FORMAT', 'datetimeFormat');
+    define('SESSION_COUNTER', 'sessionCounter');
+    define('SESSION_LOCALE', 'sessionLocale');
+    define('SESSION_USER_ACCOUNTS', 'userAccounts');
 
-define('SESSION_LAST_REQUEST_PAGE', 'SESSION_LAST_REQUEST_PAGE');
-define('SESSION_LAST_REQUEST_TIME', 'SESSION_LAST_REQUEST_TIME');
+    define('SESSION_LAST_REQUEST_PAGE', 'SESSION_LAST_REQUEST_PAGE');
+    define('SESSION_LAST_REQUEST_TIME', 'SESSION_LAST_REQUEST_TIME');
 
-define('DEFAULT_TIMEZONE', 'US/Eastern');
-define('DEFAULT_CURRENCY', 1); // US Dollar
-define('DEFAULT_LANGUAGE', 1); // English
-define('DEFAULT_DATE_FORMAT', 'M j, Y');
-define('DEFAULT_DATE_PICKER_FORMAT', 'M d, yyyy');
-define('DEFAULT_DATETIME_FORMAT', 'F j, Y, g:i a');
-define('DEFAULT_QUERY_CACHE', 120); // minutes
-define('DEFAULT_LOCALE', 'en');
+    define('DEFAULT_TIMEZONE', 'US/Eastern');
+    define('DEFAULT_CURRENCY', 1); // US Dollar
+    define('DEFAULT_LANGUAGE', 1); // English
+    define('DEFAULT_DATE_FORMAT', 'M j, Y');
+    define('DEFAULT_DATE_PICKER_FORMAT', 'M d, yyyy');
+    define('DEFAULT_DATETIME_FORMAT', 'F j, Y, g:i a');
+    define('DEFAULT_QUERY_CACHE', 120); // minutes
+    define('DEFAULT_LOCALE', 'en');
 
-define('RESULT_SUCCESS', 'success');
-define('RESULT_FAILURE', 'failure');
+    define('RESULT_SUCCESS', 'success');
+    define('RESULT_FAILURE', 'failure');
 
 
-define('PAYMENT_LIBRARY_OMNIPAY', 1);
-define('PAYMENT_LIBRARY_PHP_PAYMENTS', 2);
+    define('PAYMENT_LIBRARY_OMNIPAY', 1);
+    define('PAYMENT_LIBRARY_PHP_PAYMENTS', 2);
 
-define('GATEWAY_AUTHORIZE_NET', 1);
-define('GATEWAY_AUTHORIZE_NET_SIM', 2);
-define('GATEWAY_PAYPAL_EXPRESS', 17);
-define('GATEWAY_PAYPAL_PRO', 18);
-define('GATEWAY_STRIPE', 23);
-define('GATEWAY_TWO_CHECKOUT', 27);
-define('GATEWAY_BEANSTREAM', 29);
-define('GATEWAY_PSIGATE', 30);
-define('GATEWAY_MOOLAH', 31);
-define('GATEWAY_BITPAY', 42);
-define('GATEWAY_DWOLLA', 43);
+    define('GATEWAY_AUTHORIZE_NET', 1);
+    define('GATEWAY_AUTHORIZE_NET_SIM', 2);
+    define('GATEWAY_PAYPAL_EXPRESS', 17);
+    define('GATEWAY_PAYPAL_PRO', 18);
+    define('GATEWAY_STRIPE', 23);
+    define('GATEWAY_TWO_CHECKOUT', 27);
+    define('GATEWAY_BEANSTREAM', 29);
+    define('GATEWAY_PSIGATE', 30);
+    define('GATEWAY_MOOLAH', 31);
+    define('GATEWAY_BITPAY', 42);
+    define('GATEWAY_DWOLLA', 43);
 
-define('EVENT_CREATE_CLIENT', 1);
-define('EVENT_CREATE_INVOICE', 2);
-define('EVENT_CREATE_QUOTE', 3);
-define('EVENT_CREATE_PAYMENT', 4);
+    define('EVENT_CREATE_CLIENT', 1);
+    define('EVENT_CREATE_INVOICE', 2);
+    define('EVENT_CREATE_QUOTE', 3);
+    define('EVENT_CREATE_PAYMENT', 4);
 
-define('REQUESTED_PRO_PLAN', 'REQUESTED_PRO_PLAN');
-define('DEMO_ACCOUNT_ID', 'DEMO_ACCOUNT_ID');
-define('PREV_USER_ID', 'PREV_USER_ID');
-define('NINJA_ACCOUNT_KEY', 'zg4ylmzDkdkPOT8yoKQw9LTWaoZJx79h');
-define('NINJA_GATEWAY_ID', GATEWAY_STRIPE);
-define('NINJA_GATEWAY_CONFIG', '');
-define('NINJA_WEB_URL', 'https://www.invoiceninja.com');
-define('NINJA_APP_URL', 'https://app.invoiceninja.com');
-define('NINJA_VERSION', '2.3.3');
-define('NINJA_DATE', '2000-01-01');
+    define('REQUESTED_PRO_PLAN', 'REQUESTED_PRO_PLAN');
+    define('DEMO_ACCOUNT_ID', 'DEMO_ACCOUNT_ID');
+    define('PREV_USER_ID', 'PREV_USER_ID');
+    define('NINJA_ACCOUNT_KEY', 'zg4ylmzDkdkPOT8yoKQw9LTWaoZJx79h');
+    define('NINJA_GATEWAY_ID', GATEWAY_STRIPE);
+    define('NINJA_GATEWAY_CONFIG', '');
+    define('NINJA_WEB_URL', 'https://www.invoiceninja.com');
+    define('NINJA_APP_URL', 'https://app.invoiceninja.com');
+    define('NINJA_VERSION', '2.3.3');
+    define('NINJA_DATE', '2000-01-01');
 
-define('NINJA_FROM_EMAIL', 'maildelivery@invoiceninja.com');
-define('RELEASES_URL', 'https://github.com/hillelcoren/invoice-ninja/releases/');
-define('ZAPIER_URL', 'https://zapier.com/developer/invite/11276/85cf0ee4beae8e802c6c579eb4e351f1/');
-define('OUTDATE_BROWSER_URL', 'http://browsehappy.com/');
-define('PDFMAKE_DOCS', 'http://pdfmake.org/playground.html');
+    define('NINJA_FROM_EMAIL', 'maildelivery@invoiceninja.com');
+    define('RELEASES_URL', 'https://github.com/hillelcoren/invoice-ninja/releases/');
+    define('ZAPIER_URL', 'https://zapier.com/developer/invite/11276/85cf0ee4beae8e802c6c579eb4e351f1/');
+    define('OUTDATE_BROWSER_URL', 'http://browsehappy.com/');
+    define('PDFMAKE_DOCS', 'http://pdfmake.org/playground.html');
 
-define('COUNT_FREE_DESIGNS', 4);
-define('COUNT_FREE_DESIGNS_SELF_HOST', 5); // include the custom design
-define('PRODUCT_ONE_CLICK_INSTALL', 1);
-define('PRODUCT_INVOICE_DESIGNS', 2);
-define('PRODUCT_WHITE_LABEL', 3);
-define('PRODUCT_SELF_HOST', 4);
-define('WHITE_LABEL_AFFILIATE_KEY', '92D2J5');
-define('INVOICE_DESIGNS_AFFILIATE_KEY', 'T3RS74');
-define('SELF_HOST_AFFILIATE_KEY', '8S69AD');
+    define('COUNT_FREE_DESIGNS', 4);
+    define('COUNT_FREE_DESIGNS_SELF_HOST', 5); // include the custom design
+    define('PRODUCT_ONE_CLICK_INSTALL', 1);
+    define('PRODUCT_INVOICE_DESIGNS', 2);
+    define('PRODUCT_WHITE_LABEL', 3);
+    define('PRODUCT_SELF_HOST', 4);
+    define('WHITE_LABEL_AFFILIATE_KEY', '92D2J5');
+    define('INVOICE_DESIGNS_AFFILIATE_KEY', 'T3RS74');
+    define('SELF_HOST_AFFILIATE_KEY', '8S69AD');
 
-define('PRO_PLAN_PRICE', 50);
-define('WHITE_LABEL_PRICE', 20);
-define('INVOICE_DESIGNS_PRICE', 10);
+    define('PRO_PLAN_PRICE', 50);
+    define('WHITE_LABEL_PRICE', 20);
+    define('INVOICE_DESIGNS_PRICE', 10);
 
-define('USER_TYPE_SELF_HOST', 'SELF_HOST');
-define('USER_TYPE_CLOUD_HOST', 'CLOUD_HOST');
-define('NEW_VERSION_AVAILABLE', 'NEW_VERSION_AVAILABLE');
+    define('USER_TYPE_SELF_HOST', 'SELF_HOST');
+    define('USER_TYPE_CLOUD_HOST', 'CLOUD_HOST');
+    define('NEW_VERSION_AVAILABLE', 'NEW_VERSION_AVAILABLE');
 
-define('TEST_USERNAME', 'user@email.com');
-define('TEST_PASSWORD', 'password');
+    define('TEST_USERNAME', 'user@example.com');
+    define('TEST_PASSWORD', 'password');
 
-define('TOKEN_BILLING_DISABLED', 1);
-define('TOKEN_BILLING_OPT_IN', 2);
-define('TOKEN_BILLING_OPT_OUT', 3);
-define('TOKEN_BILLING_ALWAYS', 4);
+    define('TOKEN_BILLING_DISABLED', 1);
+    define('TOKEN_BILLING_OPT_IN', 2);
+    define('TOKEN_BILLING_OPT_OUT', 3);
+    define('TOKEN_BILLING_ALWAYS', 4);
 
-define('PAYMENT_TYPE_PAYPAL', 'PAYMENT_TYPE_PAYPAL');
-define('PAYMENT_TYPE_CREDIT_CARD', 'PAYMENT_TYPE_CREDIT_CARD');
-define('PAYMENT_TYPE_BITCOIN', 'PAYMENT_TYPE_BITCOIN');
-define('PAYMENT_TYPE_DWOLLA', 'PAYMENT_TYPE_DWOLLA');
-define('PAYMENT_TYPE_TOKEN', 'PAYMENT_TYPE_TOKEN');
-define('PAYMENT_TYPE_ANY', 'PAYMENT_TYPE_ANY');
+    define('PAYMENT_TYPE_PAYPAL', 'PAYMENT_TYPE_PAYPAL');
+    define('PAYMENT_TYPE_CREDIT_CARD', 'PAYMENT_TYPE_CREDIT_CARD');
+    define('PAYMENT_TYPE_BITCOIN', 'PAYMENT_TYPE_BITCOIN');
+    define('PAYMENT_TYPE_DWOLLA', 'PAYMENT_TYPE_DWOLLA');
+    define('PAYMENT_TYPE_TOKEN', 'PAYMENT_TYPE_TOKEN');
+    define('PAYMENT_TYPE_ANY', 'PAYMENT_TYPE_ANY');
 
-$creditCards = [
-            1 => ['card' => 'images/credit_cards/Test-Visa-Icon.png', 'text' => 'Visa'],
-            2 => ['card' => 'images/credit_cards/Test-MasterCard-Icon.png', 'text' => 'Master Card'],
-            4 => ['card' => 'images/credit_cards/Test-AmericanExpress-Icon.png', 'text' => 'American Express'],
-            8 => ['card' => 'images/credit_cards/Test-Diners-Icon.png', 'text' => 'Diners'],
-            16 => ['card' => 'images/credit_cards/Test-Discover-Icon.png', 'text' => 'Discover']
-        ];
+    $creditCards = [
+                1 => ['card' => 'images/credit_cards/Test-Visa-Icon.png', 'text' => 'Visa'],
+                2 => ['card' => 'images/credit_cards/Test-MasterCard-Icon.png', 'text' => 'Master Card'],
+                4 => ['card' => 'images/credit_cards/Test-AmericanExpress-Icon.png', 'text' => 'American Express'],
+                8 => ['card' => 'images/credit_cards/Test-Diners-Icon.png', 'text' => 'Diners'],
+                16 => ['card' => 'images/credit_cards/Test-Discover-Icon.png', 'text' => 'Discover']
+            ];
 
-define('CREDIT_CARDS', serialize($creditCards));
+    define('CREDIT_CARDS', serialize($creditCards));
 
-function uctrans($text)
-{
-    return ucwords(trans($text));
-}
+    function uctrans($text)
+    {
+        return ucwords(trans($text));
+    }
 
-// optional trans: only return the string if it's translated
-function otrans($text)
-{
-    $locale = Session::get(SESSION_LOCALE);
+    // optional trans: only return the string if it's translated
+    function otrans($text)
+    {
+        $locale = Session::get(SESSION_LOCALE);
 
-    if ($locale == 'en') {
-        return trans($text);
-    } else {
-        $string = trans($text);
-        $english = trans($text, [], 'en');
-        return $string != $english ? $string : '';
+        if ($locale == 'en') {
+            return trans($text);
+        } else {
+            $string = trans($text);
+            $english = trans($text, [], 'en');
+            return $string != $english ? $string : '';
+        }
     }
 }
 
diff --git a/config/mail.php b/config/mail.php
index 728a0356929c..91d6e8fbcd8b 100644
--- a/config/mail.php
+++ b/config/mail.php
@@ -119,6 +119,6 @@ return [
 	|
 	*/
 
-	'pretend' => false,
+	'pretend' => env('MAIL_PRETEND'),
 
 ];
diff --git a/database/seeds/UserTableSeeder.php b/database/seeds/UserTableSeeder.php
index 8e11be5ddd0a..82226be35b06 100644
--- a/database/seeds/UserTableSeeder.php
+++ b/database/seeds/UserTableSeeder.php
@@ -23,6 +23,8 @@ class UserTableSeeder extends Seeder
             'username' => TEST_USERNAME,
             'account_id' => $account->id,
             'password' => Hash::make(TEST_PASSWORD),
+            'registered' => true,
+            'confirmed' => true,
         ]);
 	}
 
diff --git a/resources/lang/de/texts.php b/resources/lang/de/texts.php
index 6c6aa4235cea..69bd0dcef246 100644
--- a/resources/lang/de/texts.php
+++ b/resources/lang/de/texts.php
@@ -31,7 +31,7 @@ return array(
   'client' => 'Kunde',
   'invoice_date' => 'Rechnungsdatum',
   'due_date' => 'Fällig am',
-  'invoice_number' => 'Rechungsnummer',
+  'invoice_number' => 'Rechnungsnummer',
   'invoice_number_short' => 'Rechnung #',
   'po_number' => 'Bestellnummer',
   'po_number_short' => 'BN #',
@@ -346,7 +346,7 @@ return array(
 
   'chart_builder' => 'Diagrammersteller',
   'ninja_email_footer' => 'Nutze :site um Kunden Rechnungen zu stellen und online bezahlt zu werden, kostenlos!',
-  'go_pro' => 'Werde Pro-Mitglied',
+  'go_pro' => 'Go Pro',
 
   // Quotes
   'quote' => 'Angebot',
diff --git a/resources/views/accounts/product.blade.php b/resources/views/accounts/product.blade.php
index 9c12aea4aaa2..cac6cf81d903 100644
--- a/resources/views/accounts/product.blade.php
+++ b/resources/views/accounts/product.blade.php
@@ -20,7 +20,7 @@
   @endif
 
   {!! Former::text('product_key')->label('texts.product') !!}
-  {!! Former::textarea('notes')->data_bind("value: wrapped_notes, valueUpdate: 'afterkeydown'") !!}
+  {!! Former::textarea('notes') !!}
   {!! Former::text('cost') !!}
 
   </div>
@@ -35,29 +35,6 @@
 
   <script type="text/javascript">
 
-  function ViewModel(data) {
-    var self = this;
-    @if ($product)
-      self.notes = ko.observable(wordWrapText('{{ str_replace(["\r\n","\r","\n"], '\n', addslashes($product->notes)) }}', 300));
-    @else
-      self.notes = ko.observable('');
-    @endif
-    
-    self.wrapped_notes = ko.computed({
-      read: function() {
-        return self.notes();
-      },
-      write: function(value) {
-        value = wordWrapText(value, 235);
-        self.notes(value);
-      },
-      owner: this
-    });
-  }
-
-  window.model = new ViewModel();
-  ko.applyBindings(model);  
-
   $(function() {
     $('#product_key').focus();
   });
diff --git a/resources/views/invoices/edit.blade.php b/resources/views/invoices/edit.blade.php
index 49dbd5a7f421..071ea0613151 100644
--- a/resources/views/invoices/edit.blade.php
+++ b/resources/views/invoices/edit.blade.php
@@ -100,10 +100,10 @@
 					<div class="pull-right" style="padding-top: 6px">
                         {!! trans('texts.created_by_invoice', ['invoice' => link_to('/invoices/'.$invoice->recurring_invoice->public_id, trans('texts.recurring_invoice'))]) !!}
 					</div>
-				@elseif ($invoice && $invoice->last_sent_date && $invoice->recurring_invoices->last())
+				@elseif ($invoice && isset($lastSent) && $lastSent)
                     <div class="pull-right" style="padding-top: 6px">
                         {!! trans('texts.last_invoice_sent', [
-                                'date' => link_to('/invoices/'.$invoice->recurring_invoices->last()->public_id, Utils::dateToString($invoice->last_sent_date))
+                                'date' => link_to('/invoices/'.$lastSent->public_id, Utils::dateToString($invoice->last_sent_date), ['id' => 'lastInvoiceSent'])
                             ]) !!}
                     </div>
                 @endif
diff --git a/resources/views/reports/chart_builder.blade.php b/resources/views/reports/chart_builder.blade.php
index 8275318bd1d7..361a4d6ad386 100644
--- a/resources/views/reports/chart_builder.blade.php
+++ b/resources/views/reports/chart_builder.blade.php
@@ -165,7 +165,7 @@
 
 	var ctx = document.getElementById('monthly-reports').getContext('2d');
 	var chart = {
-		labels: {!! json_encode($labels) !!},		
+		labels: {!! json_encode($labels) !!},
 		datasets: [
 		@foreach ($datasets as $dataset)
 			{
diff --git a/tests/_bootstrap.php b/tests/_bootstrap.php
index 007b01dfb53d..464fcb4d7f7a 100644
--- a/tests/_bootstrap.php
+++ b/tests/_bootstrap.php
@@ -2,5 +2,5 @@
 // This is global bootstrap for autoloading
 use Codeception\Util\Fixtures;
 
-Fixtures::add('username', 'user@email.com');
+Fixtures::add('username', 'user@example.com');
 Fixtures::add('password', 'password');
\ No newline at end of file
diff --git a/tests/_support/FunctionalTester.php b/tests/_support/FunctionalTester.php
index 8f9d5f234a2e..173b7a82e7a6 100644
--- a/tests/_support/FunctionalTester.php
+++ b/tests/_support/FunctionalTester.php
@@ -1,5 +1,6 @@
 <?php
 
+use Codeception\Util\Fixtures;
 
 /**
  * Inherited Methods
@@ -23,4 +24,15 @@ class FunctionalTester extends \Codeception\Actor
    /**
     * Define custom actions here
     */
+    function checkIfLogin(\FunctionalTester $I)
+    {
+        //if ($I->loadSessionSnapshot('login')) return;
+
+        $I->amOnPage('/login');
+        $I->fillField(['name' => 'email'], Fixtures::get('username'));
+        $I->fillField(['name' => 'password'], Fixtures::get('password'));
+        $I->click('Let\'s go');
+
+        //$I->saveSessionSnapshot('login');
+    }   
 }
diff --git a/tests/_support/_generated/FunctionalTesterActions.php b/tests/_support/_generated/FunctionalTesterActions.php
index 8062ce63c7f7..06431340137a 100644
--- a/tests/_support/_generated/FunctionalTesterActions.php
+++ b/tests/_support/_generated/FunctionalTesterActions.php
@@ -1,4 +1,4 @@
-<?php  //[STAMP] 36f7a8f691a15285be178f5636f52285
+<?php  //[STAMP] 6309082647e087b523ad1f61b018a08d
 namespace _generated;
 
 // This class was automatically generated by build task
@@ -6,6 +6,8 @@ namespace _generated;
 // @codingStandardsIgnoreFile
 
 use Helper\Functional;
+use Codeception\Module\PhpBrowser;
+use Codeception\Module\Laravel5;
 
 trait FunctionalTesterActions
 {
@@ -15,4 +17,2573 @@ trait FunctionalTesterActions
     abstract protected function getScenario();
 
     
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Sets the HTTP header to the passed value - which is used on
+     * subsequent HTTP requests through PhpBrowser.
+     *
+     * Example:
+     * ```php
+     * <?php
+     * $I->setHeader('X-Requested-With', 'Codeception');
+     * $I->amOnPage('test-headers.php');
+     * ?>
+     * ```
+     *
+     * @param string $name the name of the request header
+     * @param string $value the value to set it to for subsequent
+     *        requests
+     * @see \Codeception\Module\PhpBrowser::setHeader()
+     */
+    public function setHeader($name, $value) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('setHeader', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Deletes the header with the passed name.  Subsequent requests
+     * will not have the deleted header in its request.
+     *
+     * Example:
+     * ```php
+     * <?php
+     * $I->setHeader('X-Requested-With', 'Codeception');
+     * $I->amOnPage('test-headers.php');
+     * // ...
+     * $I->deleteHeader('X-Requested-With');
+     * $I->amOnPage('some-other-page.php');
+     * ?>
+     * ```
+     * 
+     * @param string $name the name of the header to delete.
+     * @see \Codeception\Module\PhpBrowser::deleteHeader()
+     */
+    public function deleteHeader($name) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('deleteHeader', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Authenticates user for HTTP_AUTH
+     *
+     * @param $username
+     * @param $password
+     * @see \Codeception\Lib\InnerBrowser::amHttpAuthenticated()
+     */
+    public function amHttpAuthenticated($username, $password) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Condition('amHttpAuthenticated', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Open web page at the given absolute URL and sets its hostname as the base host.
+     *
+     * ``` php
+     * <?php
+     * $I->amOnUrl('http://codeception.com');
+     * $I->amOnPage('/quickstart'); // moves to http://codeception.com/quickstart
+     * ?>
+     * ```
+     * @see \Codeception\Module\PhpBrowser::amOnUrl()
+     */
+    public function amOnUrl($url) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Condition('amOnUrl', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Changes the subdomain for the 'url' configuration parameter.
+     * Does not open a page; use `amOnPage` for that.
+     *
+     * ``` php
+     * <?php
+     * // If config is: 'http://mysite.com'
+     * // or config is: 'http://www.mysite.com'
+     * // or config is: 'http://company.mysite.com'
+     *
+     * $I->amOnSubdomain('user');
+     * $I->amOnPage('/');
+     * // moves to http://user.mysite.com/
+     * ?>
+     * ```
+     *
+     * @param $subdomain
+     *
+     * @return mixed
+     * @see \Codeception\Module\PhpBrowser::amOnSubdomain()
+     */
+    public function amOnSubdomain($subdomain) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Condition('amOnSubdomain', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Low-level API method.
+     * If Codeception commands are not enough, use [Guzzle HTTP Client](http://guzzlephp.org/) methods directly
+     *
+     * Example:
+     *
+     * ``` php
+     * <?php
+     * $I->executeInGuzzle(function (\GuzzleHttp\Client $client) {
+     *      $client->get('/get', ['query' => ['foo' => 'bar']]);
+     * });
+     * ?>
+     * ```
+     *
+     * It is not recommended to use this command on a regular basis.
+     * If Codeception lacks important Guzzle Client methods, implement them and submit patches.
+     *
+     * @param callable $function
+     * @see \Codeception\Module\PhpBrowser::executeInGuzzle()
+     */
+    public function executeInGuzzle($function) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('executeInGuzzle', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Opens the page for the given relative URI.
+     *
+     * ``` php
+     * <?php
+     * // opens front page
+     * $I->amOnPage('/');
+     * // opens /register page
+     * $I->amOnPage('/register');
+     * ?>
+     * ```
+     *
+     * @param $page
+     * @see \Codeception\Lib\InnerBrowser::amOnPage()
+     */
+    public function amOnPage($page) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Condition('amOnPage', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Perform a click on a link or a button, given by a locator.
+     * If a fuzzy locator is given, the page will be searched for a button, link, or image matching the locator string.
+     * For buttons, the "value" attribute, "name" attribute, and inner text are searched.
+     * For links, the link text is searched.
+     * For images, the "alt" attribute and inner text of any parent links are searched.
+     *
+     * The second parameter is a context (CSS or XPath locator) to narrow the search.
+     *
+     * Note that if the locator matches a button of type `submit`, the form will be submitted.
+     *
+     * ``` php
+     * <?php
+     * // simple link
+     * $I->click('Logout');
+     * // button of form
+     * $I->click('Submit');
+     * // CSS button
+     * $I->click('#form input[type=submit]');
+     * // XPath
+     * $I->click('//form/*[@type=submit]');
+     * // link in context
+     * $I->click('Logout', '#nav');
+     * // using strict locator
+     * $I->click(['link' => 'Login']);
+     * ?>
+     * ```
+     *
+     * @param $link
+     * @param $context
+     * @see \Codeception\Lib\InnerBrowser::click()
+     */
+    public function click($link, $context = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('click', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that the current page contains the given string.
+     * Specify a locator as the second parameter to match a specific region.
+     *
+     * ``` php
+     * <?php
+     * $I->see('Logout'); // I can suppose user is logged in
+     * $I->see('Sign Up','h1'); // I can suppose it's a signup page
+     * $I->see('Sign Up','//body/h1'); // with XPath
+     * ?>
+     * ```
+     *
+     * @param      $text
+     * @param null $selector
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Lib\InnerBrowser::see()
+     */
+    public function canSee($text, $selector = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('see', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that the current page contains the given string.
+     * Specify a locator as the second parameter to match a specific region.
+     *
+     * ``` php
+     * <?php
+     * $I->see('Logout'); // I can suppose user is logged in
+     * $I->see('Sign Up','h1'); // I can suppose it's a signup page
+     * $I->see('Sign Up','//body/h1'); // with XPath
+     * ?>
+     * ```
+     *
+     * @param      $text
+     * @param null $selector
+     * @see \Codeception\Lib\InnerBrowser::see()
+     */
+    public function see($text, $selector = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('see', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that the current page doesn't contain the text specified.
+     * Give a locator as the second parameter to match a specific region.
+     *
+     * ```php
+     * <?php
+     * $I->dontSee('Login'); // I can suppose user is already logged in
+     * $I->dontSee('Sign Up','h1'); // I can suppose it's not a signup page
+     * $I->dontSee('Sign Up','//body/h1'); // with XPath
+     * ?>
+     * ```
+     *
+     * @param      $text
+     * @param null $selector
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Lib\InnerBrowser::dontSee()
+     */
+    public function cantSee($text, $selector = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSee', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that the current page doesn't contain the text specified.
+     * Give a locator as the second parameter to match a specific region.
+     *
+     * ```php
+     * <?php
+     * $I->dontSee('Login'); // I can suppose user is already logged in
+     * $I->dontSee('Sign Up','h1'); // I can suppose it's not a signup page
+     * $I->dontSee('Sign Up','//body/h1'); // with XPath
+     * ?>
+     * ```
+     *
+     * @param      $text
+     * @param null $selector
+     * @see \Codeception\Lib\InnerBrowser::dontSee()
+     */
+    public function dontSee($text, $selector = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSee', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that there's a link with the specified text.
+     * Give a full URL as the second parameter to match links with that exact URL.
+     *
+     * ``` php
+     * <?php
+     * $I->seeLink('Logout'); // matches <a href="#">Logout</a>
+     * $I->seeLink('Logout','/logout'); // matches <a href="/logout">Logout</a>
+     * ?>
+     * ```
+     *
+     * @param      $text
+     * @param null $url
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Lib\InnerBrowser::seeLink()
+     */
+    public function canSeeLink($text, $url = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeLink', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that there's a link with the specified text.
+     * Give a full URL as the second parameter to match links with that exact URL.
+     *
+     * ``` php
+     * <?php
+     * $I->seeLink('Logout'); // matches <a href="#">Logout</a>
+     * $I->seeLink('Logout','/logout'); // matches <a href="/logout">Logout</a>
+     * ?>
+     * ```
+     *
+     * @param      $text
+     * @param null $url
+     * @see \Codeception\Lib\InnerBrowser::seeLink()
+     */
+    public function seeLink($text, $url = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeLink', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that the page doesn't contain a link with the given string.
+     * If the second parameter is given, only links with a matching "href" attribute will be checked.
+     *
+     * ``` php
+     * <?php
+     * $I->dontSeeLink('Logout'); // I suppose user is not logged in
+     * $I->dontSeeLink('Checkout now', '/store/cart.php');
+     * ?>
+     * ```
+     *
+     * @param $text
+     * @param null $url
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Lib\InnerBrowser::dontSeeLink()
+     */
+    public function cantSeeLink($text, $url = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeLink', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that the page doesn't contain a link with the given string.
+     * If the second parameter is given, only links with a matching "href" attribute will be checked.
+     *
+     * ``` php
+     * <?php
+     * $I->dontSeeLink('Logout'); // I suppose user is not logged in
+     * $I->dontSeeLink('Checkout now', '/store/cart.php');
+     * ?>
+     * ```
+     *
+     * @param $text
+     * @param null $url
+     * @see \Codeception\Lib\InnerBrowser::dontSeeLink()
+     */
+    public function dontSeeLink($text, $url = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeLink', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that current URI contains the given string.
+     *
+     * ``` php
+     * <?php
+     * // to match: /home/dashboard
+     * $I->seeInCurrentUrl('home');
+     * // to match: /users/1
+     * $I->seeInCurrentUrl('/users/');
+     * ?>
+     * ```
+     *
+     * @param $uri
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Lib\InnerBrowser::seeInCurrentUrl()
+     */
+    public function canSeeInCurrentUrl($uri) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeInCurrentUrl', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that current URI contains the given string.
+     *
+     * ``` php
+     * <?php
+     * // to match: /home/dashboard
+     * $I->seeInCurrentUrl('home');
+     * // to match: /users/1
+     * $I->seeInCurrentUrl('/users/');
+     * ?>
+     * ```
+     *
+     * @param $uri
+     * @see \Codeception\Lib\InnerBrowser::seeInCurrentUrl()
+     */
+    public function seeInCurrentUrl($uri) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeInCurrentUrl', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that the current URI doesn't contain the given string.
+     *
+     * ``` php
+     * <?php
+     * $I->dontSeeInCurrentUrl('/users/');
+     * ?>
+     * ```
+     *
+     * @param $uri
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Lib\InnerBrowser::dontSeeInCurrentUrl()
+     */
+    public function cantSeeInCurrentUrl($uri) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeInCurrentUrl', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that the current URI doesn't contain the given string.
+     *
+     * ``` php
+     * <?php
+     * $I->dontSeeInCurrentUrl('/users/');
+     * ?>
+     * ```
+     *
+     * @param $uri
+     * @see \Codeception\Lib\InnerBrowser::dontSeeInCurrentUrl()
+     */
+    public function dontSeeInCurrentUrl($uri) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeInCurrentUrl', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that the current URL is equal to the given string.
+     * Unlike `seeInCurrentUrl`, this only matches the full URL.
+     *
+     * ``` php
+     * <?php
+     * // to match root url
+     * $I->seeCurrentUrlEquals('/');
+     * ?>
+     * ```
+     *
+     * @param $uri
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Lib\InnerBrowser::seeCurrentUrlEquals()
+     */
+    public function canSeeCurrentUrlEquals($uri) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeCurrentUrlEquals', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that the current URL is equal to the given string.
+     * Unlike `seeInCurrentUrl`, this only matches the full URL.
+     *
+     * ``` php
+     * <?php
+     * // to match root url
+     * $I->seeCurrentUrlEquals('/');
+     * ?>
+     * ```
+     *
+     * @param $uri
+     * @see \Codeception\Lib\InnerBrowser::seeCurrentUrlEquals()
+     */
+    public function seeCurrentUrlEquals($uri) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeCurrentUrlEquals', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that the current URL doesn't equal the given string.
+     * Unlike `dontSeeInCurrentUrl`, this only matches the full URL.
+     *
+     * ``` php
+     * <?php
+     * // current url is not root
+     * $I->dontSeeCurrentUrlEquals('/');
+     * ?>
+     * ```
+     *
+     * @param $uri
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Lib\InnerBrowser::dontSeeCurrentUrlEquals()
+     */
+    public function cantSeeCurrentUrlEquals($uri) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeCurrentUrlEquals', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that the current URL doesn't equal the given string.
+     * Unlike `dontSeeInCurrentUrl`, this only matches the full URL.
+     *
+     * ``` php
+     * <?php
+     * // current url is not root
+     * $I->dontSeeCurrentUrlEquals('/');
+     * ?>
+     * ```
+     *
+     * @param $uri
+     * @see \Codeception\Lib\InnerBrowser::dontSeeCurrentUrlEquals()
+     */
+    public function dontSeeCurrentUrlEquals($uri) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeCurrentUrlEquals', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that the current URL matches the given regular expression.
+     *
+     * ``` php
+     * <?php
+     * // to match root url
+     * $I->seeCurrentUrlMatches('~$/users/(\d+)~');
+     * ?>
+     * ```
+     *
+     * @param $uri
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Lib\InnerBrowser::seeCurrentUrlMatches()
+     */
+    public function canSeeCurrentUrlMatches($uri) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeCurrentUrlMatches', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that the current URL matches the given regular expression.
+     *
+     * ``` php
+     * <?php
+     * // to match root url
+     * $I->seeCurrentUrlMatches('~$/users/(\d+)~');
+     * ?>
+     * ```
+     *
+     * @param $uri
+     * @see \Codeception\Lib\InnerBrowser::seeCurrentUrlMatches()
+     */
+    public function seeCurrentUrlMatches($uri) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeCurrentUrlMatches', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that current url doesn't match the given regular expression.
+     *
+     * ``` php
+     * <?php
+     * // to match root url
+     * $I->dontSeeCurrentUrlMatches('~$/users/(\d+)~');
+     * ?>
+     * ```
+     *
+     * @param $uri
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Lib\InnerBrowser::dontSeeCurrentUrlMatches()
+     */
+    public function cantSeeCurrentUrlMatches($uri) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeCurrentUrlMatches', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that current url doesn't match the given regular expression.
+     *
+     * ``` php
+     * <?php
+     * // to match root url
+     * $I->dontSeeCurrentUrlMatches('~$/users/(\d+)~');
+     * ?>
+     * ```
+     *
+     * @param $uri
+     * @see \Codeception\Lib\InnerBrowser::dontSeeCurrentUrlMatches()
+     */
+    public function dontSeeCurrentUrlMatches($uri) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeCurrentUrlMatches', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Executes the given regular expression against the current URI and returns the first match.
+     * If no parameters are provided, the full URI is returned.
+     *
+     * ``` php
+     * <?php
+     * $user_id = $I->grabFromCurrentUrl('~$/user/(\d+)/~');
+     * $uri = $I->grabFromCurrentUrl();
+     * ?>
+     * ```
+     *
+     * @param null $uri
+     *
+     * @internal param $url
+     * @return mixed
+     * @see \Codeception\Lib\InnerBrowser::grabFromCurrentUrl()
+     */
+    public function grabFromCurrentUrl($uri = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('grabFromCurrentUrl', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that the specified checkbox is checked.
+     *
+     * ``` php
+     * <?php
+     * $I->seeCheckboxIsChecked('#agree'); // I suppose user agreed to terms
+     * $I->seeCheckboxIsChecked('#signup_form input[type=checkbox]'); // I suppose user agreed to terms, If there is only one checkbox in form.
+     * $I->seeCheckboxIsChecked('//form/input[@type=checkbox and @name=agree]');
+     * ?>
+     * ```
+     *
+     * @param $checkbox
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Lib\InnerBrowser::seeCheckboxIsChecked()
+     */
+    public function canSeeCheckboxIsChecked($checkbox) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeCheckboxIsChecked', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that the specified checkbox is checked.
+     *
+     * ``` php
+     * <?php
+     * $I->seeCheckboxIsChecked('#agree'); // I suppose user agreed to terms
+     * $I->seeCheckboxIsChecked('#signup_form input[type=checkbox]'); // I suppose user agreed to terms, If there is only one checkbox in form.
+     * $I->seeCheckboxIsChecked('//form/input[@type=checkbox and @name=agree]');
+     * ?>
+     * ```
+     *
+     * @param $checkbox
+     * @see \Codeception\Lib\InnerBrowser::seeCheckboxIsChecked()
+     */
+    public function seeCheckboxIsChecked($checkbox) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeCheckboxIsChecked', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Check that the specified checkbox is unchecked.
+     *
+     * ``` php
+     * <?php
+     * $I->dontSeeCheckboxIsChecked('#agree'); // I suppose user didn't agree to terms
+     * $I->seeCheckboxIsChecked('#signup_form input[type=checkbox]'); // I suppose user didn't check the first checkbox in form.
+     * ?>
+     * ```
+     *
+     * @param $checkbox
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Lib\InnerBrowser::dontSeeCheckboxIsChecked()
+     */
+    public function cantSeeCheckboxIsChecked($checkbox) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeCheckboxIsChecked', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Check that the specified checkbox is unchecked.
+     *
+     * ``` php
+     * <?php
+     * $I->dontSeeCheckboxIsChecked('#agree'); // I suppose user didn't agree to terms
+     * $I->seeCheckboxIsChecked('#signup_form input[type=checkbox]'); // I suppose user didn't check the first checkbox in form.
+     * ?>
+     * ```
+     *
+     * @param $checkbox
+     * @see \Codeception\Lib\InnerBrowser::dontSeeCheckboxIsChecked()
+     */
+    public function dontSeeCheckboxIsChecked($checkbox) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeCheckboxIsChecked', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that the given input field or textarea contains the given value.
+     * For fuzzy locators, fields are matched by label text, the "name" attribute, CSS, and XPath.
+     *
+     * ``` php
+     * <?php
+     * $I->seeInField('Body','Type your comment here');
+     * $I->seeInField('form textarea[name=body]','Type your comment here');
+     * $I->seeInField('form input[type=hidden]','hidden_value');
+     * $I->seeInField('#searchform input','Search');
+     * $I->seeInField('//form/*[@name=search]','Search');
+     * $I->seeInField(['name' => 'search'], 'Search');
+     * ?>
+     * ```
+     *
+     * @param $field
+     * @param $value
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Lib\InnerBrowser::seeInField()
+     */
+    public function canSeeInField($field, $value) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeInField', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that the given input field or textarea contains the given value.
+     * For fuzzy locators, fields are matched by label text, the "name" attribute, CSS, and XPath.
+     *
+     * ``` php
+     * <?php
+     * $I->seeInField('Body','Type your comment here');
+     * $I->seeInField('form textarea[name=body]','Type your comment here');
+     * $I->seeInField('form input[type=hidden]','hidden_value');
+     * $I->seeInField('#searchform input','Search');
+     * $I->seeInField('//form/*[@name=search]','Search');
+     * $I->seeInField(['name' => 'search'], 'Search');
+     * ?>
+     * ```
+     *
+     * @param $field
+     * @param $value
+     * @see \Codeception\Lib\InnerBrowser::seeInField()
+     */
+    public function seeInField($field, $value) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeInField', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that an input field or textarea doesn't contain the given value.
+     * For fuzzy locators, the field is matched by label text, CSS and XPath.
+     *
+     * ``` php
+     * <?php
+     * $I->dontSeeInField('Body','Type your comment here');
+     * $I->dontSeeInField('form textarea[name=body]','Type your comment here');
+     * $I->dontSeeInField('form input[type=hidden]','hidden_value');
+     * $I->dontSeeInField('#searchform input','Search');
+     * $I->dontSeeInField('//form/*[@name=search]','Search');
+     * $I->dontSeeInField(['name' => 'search'], 'Search');
+     * ?>
+     * ```
+     *
+     * @param $field
+     * @param $value
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Lib\InnerBrowser::dontSeeInField()
+     */
+    public function cantSeeInField($field, $value) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeInField', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that an input field or textarea doesn't contain the given value.
+     * For fuzzy locators, the field is matched by label text, CSS and XPath.
+     *
+     * ``` php
+     * <?php
+     * $I->dontSeeInField('Body','Type your comment here');
+     * $I->dontSeeInField('form textarea[name=body]','Type your comment here');
+     * $I->dontSeeInField('form input[type=hidden]','hidden_value');
+     * $I->dontSeeInField('#searchform input','Search');
+     * $I->dontSeeInField('//form/*[@name=search]','Search');
+     * $I->dontSeeInField(['name' => 'search'], 'Search');
+     * ?>
+     * ```
+     *
+     * @param $field
+     * @param $value
+     * @see \Codeception\Lib\InnerBrowser::dontSeeInField()
+     */
+    public function dontSeeInField($field, $value) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeInField', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks if the array of form parameters (name => value) are set on the form matched with the
+     * passed selector.
+     * 
+     * ``` php
+     * <?php
+     * $I->seeInFormFields('form[name=myform]', [
+     *      'input1' => 'value',
+     *      'input2' => 'other value',
+     * ]);
+     * ?>
+     * ```
+     * 
+     * For multi-select elements, or to check values of multiple elements with the same name, an
+     * array may be passed:
+     * 
+     * ``` php
+     * <?php
+     * $I->seeInFormFields('.form-class', [
+     *      'multiselect' => [
+     *          'value1',
+     *          'value2',
+     *      ],
+     *      'checkbox[]' => [
+     *          'a checked value',
+     *          'another checked value',
+     *      ],
+     * ]);
+     * ?>
+     * ```
+     *
+     * Additionally, checkbox values can be checked with a boolean.
+     * 
+     * ``` php
+     * <?php
+     * $I->seeInFormFields('#form-id', [
+     *      'checkbox1' => true,        // passes if checked
+     *      'checkbox2' => false,       // passes if unchecked
+     * ]);
+     * ?>
+     * ```
+     * 
+     * Pair this with submitForm for quick testing magic.
+     * 
+     * ``` php
+     * <?php
+     * $form = [
+     *      'field1' => 'value',
+     *      'field2' => 'another value',
+     *      'checkbox1' => true,
+     *      // ...
+     * ];
+     * $I->submitForm('//form[@id=my-form]', $form, 'submitButton');
+     * // $I->amOnPage('/path/to/form-page') may be needed
+     * $I->seeInFormFields('//form[@id=my-form]', $form);
+     * ?>
+     * ```
+     * 
+     * @param $formSelector
+     * @param $params
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Lib\InnerBrowser::seeInFormFields()
+     */
+    public function canSeeInFormFields($formSelector, $params) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeInFormFields', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks if the array of form parameters (name => value) are set on the form matched with the
+     * passed selector.
+     * 
+     * ``` php
+     * <?php
+     * $I->seeInFormFields('form[name=myform]', [
+     *      'input1' => 'value',
+     *      'input2' => 'other value',
+     * ]);
+     * ?>
+     * ```
+     * 
+     * For multi-select elements, or to check values of multiple elements with the same name, an
+     * array may be passed:
+     * 
+     * ``` php
+     * <?php
+     * $I->seeInFormFields('.form-class', [
+     *      'multiselect' => [
+     *          'value1',
+     *          'value2',
+     *      ],
+     *      'checkbox[]' => [
+     *          'a checked value',
+     *          'another checked value',
+     *      ],
+     * ]);
+     * ?>
+     * ```
+     *
+     * Additionally, checkbox values can be checked with a boolean.
+     * 
+     * ``` php
+     * <?php
+     * $I->seeInFormFields('#form-id', [
+     *      'checkbox1' => true,        // passes if checked
+     *      'checkbox2' => false,       // passes if unchecked
+     * ]);
+     * ?>
+     * ```
+     * 
+     * Pair this with submitForm for quick testing magic.
+     * 
+     * ``` php
+     * <?php
+     * $form = [
+     *      'field1' => 'value',
+     *      'field2' => 'another value',
+     *      'checkbox1' => true,
+     *      // ...
+     * ];
+     * $I->submitForm('//form[@id=my-form]', $form, 'submitButton');
+     * // $I->amOnPage('/path/to/form-page') may be needed
+     * $I->seeInFormFields('//form[@id=my-form]', $form);
+     * ?>
+     * ```
+     * 
+     * @param $formSelector
+     * @param $params
+     * @see \Codeception\Lib\InnerBrowser::seeInFormFields()
+     */
+    public function seeInFormFields($formSelector, $params) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeInFormFields', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks if the array of form parameters (name => value) are not set on the form matched with
+     * the passed selector.
+     * 
+     * ``` php
+     * <?php
+     * $I->dontSeeInFormFields('form[name=myform]', [
+     *      'input1' => 'non-existent value',
+     *      'input2' => 'other non-existent value',
+     * ]);
+     * ?>
+     * ```
+     * 
+     * To check that an element hasn't been assigned any one of many values, an array can be passed
+     * as the value:
+     * 
+     * ``` php
+     * <?php
+     * $I->dontSeeInFormFields('.form-class', [
+     *      'fieldName' => [
+     *          'This value shouldn\'t be set',
+     *          'And this value shouldn\'t be set',
+     *      ],
+     * ]);
+     * ?>
+     * ```
+     *
+     * Additionally, checkbox values can be checked with a boolean.
+     * 
+     * ``` php
+     * <?php
+     * $I->dontSeeInFormFields('#form-id', [
+     *      'checkbox1' => true,        // fails if checked
+     *      'checkbox2' => false,       // fails if unchecked
+     * ]);
+     * ?>
+     * ```
+     * 
+     * @param $formSelector
+     * @param $params
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Lib\InnerBrowser::dontSeeInFormFields()
+     */
+    public function cantSeeInFormFields($formSelector, $params) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeInFormFields', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks if the array of form parameters (name => value) are not set on the form matched with
+     * the passed selector.
+     * 
+     * ``` php
+     * <?php
+     * $I->dontSeeInFormFields('form[name=myform]', [
+     *      'input1' => 'non-existent value',
+     *      'input2' => 'other non-existent value',
+     * ]);
+     * ?>
+     * ```
+     * 
+     * To check that an element hasn't been assigned any one of many values, an array can be passed
+     * as the value:
+     * 
+     * ``` php
+     * <?php
+     * $I->dontSeeInFormFields('.form-class', [
+     *      'fieldName' => [
+     *          'This value shouldn\'t be set',
+     *          'And this value shouldn\'t be set',
+     *      ],
+     * ]);
+     * ?>
+     * ```
+     *
+     * Additionally, checkbox values can be checked with a boolean.
+     * 
+     * ``` php
+     * <?php
+     * $I->dontSeeInFormFields('#form-id', [
+     *      'checkbox1' => true,        // fails if checked
+     *      'checkbox2' => false,       // fails if unchecked
+     * ]);
+     * ?>
+     * ```
+     * 
+     * @param $formSelector
+     * @param $params
+     * @see \Codeception\Lib\InnerBrowser::dontSeeInFormFields()
+     */
+    public function dontSeeInFormFields($formSelector, $params) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeInFormFields', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Submits the given form on the page, optionally with the given form
+     * values.  Give the form fields values as an array.
+     *
+     * Skipped fields will be filled by their values from the page.
+     * You don't need to click the 'Submit' button afterwards.
+     * This command itself triggers the request to form's action.
+     *
+     * You can optionally specify what button's value to include
+     * in the request with the last parameter as an alternative to
+     * explicitly setting its value in the second parameter, as
+     * button values are not otherwise included in the request.
+     *
+     * Examples:
+     *
+     * ``` php
+     * <?php
+     * $I->submitForm('#login', [
+     *     'login' => 'davert',
+     *     'password' => '123456'
+     * ]);
+     * // or
+     * $I->submitForm('#login', [
+     *     'login' => 'davert',
+     *     'password' => '123456'
+     * ], 'submitButtonName');
+     *
+     * ```
+     *
+     * For example, given this sample "Sign Up" form:
+     *
+     * ``` html
+     * <form action="/sign_up">
+     *     Login:
+     *     <input type="text" name="user[login]" /><br/>
+     *     Password:
+     *     <input type="password" name="user[password]" /><br/>
+     *     Do you agree to our terms?
+     *     <input type="checkbox" name="user[agree]" /><br/>
+     *     Select pricing plan:
+     *     <select name="plan">
+     *         <option value="1">Free</option>
+     *         <option value="2" selected="selected">Paid</option>
+     *     </select>
+     *     <input type="submit" name="submitButton" value="Submit" />
+     * </form>
+     * ```
+     *
+     * You could write the following to submit it:
+     *
+     * ``` php
+     * <?php
+     * $I->submitForm(
+     *     '#userForm',
+     *     [
+     *         'user' => [
+     *             'login' => 'Davert',
+     *             'password' => '123456',
+     *             'agree' => true
+     *         ]
+     *     ],
+     *     'submitButton'
+     * );
+     * ```
+     * Note that "2" will be the submitted value for the "plan" field, as it is
+     * the selected option.
+     * 
+     * You can also emulate a JavaScript submission by not specifying any
+     * buttons in the third parameter to submitForm.
+     * 
+     * ```php
+     * <?php
+     * $I->submitForm(
+     *     '#userForm',
+     *     [
+     *         'user' => [
+     *             'login' => 'Davert',
+     *             'password' => '123456',
+     *             'agree' => true
+     *         ]
+     *     ]
+     * );
+     * ```
+     * 
+     * Pair this with seeInFormFields for quick testing magic.
+     * 
+     * ``` php
+     * <?php
+     * $form = [
+     *      'field1' => 'value',
+     *      'field2' => 'another value',
+     *      'checkbox1' => true,
+     *      // ...
+     * ];
+     * $I->submitForm('//form[@id=my-form]', $form, 'submitButton');
+     * // $I->amOnPage('/path/to/form-page') may be needed
+     * $I->seeInFormFields('//form[@id=my-form]', $form);
+     * ?>
+     * ```
+     *
+     * Parameter values can be set to arrays for multiple input fields
+     * of the same name, or multi-select combo boxes.  For checkboxes,
+     * either the string value can be used, or boolean values which will
+     * be replaced by the checkbox's value in the DOM.
+     *
+     * ``` php
+     * <?php
+     * $I->submitForm('#my-form', [
+     *      'field1' => 'value',
+     *      'checkbox' => [
+     *          'value of first checkbox',
+     *          'value of second checkbox,
+     *      ],
+     *      'otherCheckboxes' => [
+     *          true,
+     *          false,
+     *          false
+     *      ],
+     *      'multiselect' => [
+     *          'first option value',
+     *          'second option value'
+     *      ]
+     * ]);
+     * ?>
+     * ```
+     *
+     * Mixing string and boolean values for a checkbox's value is not supported
+     * and may produce unexpected results.
+     * 
+     * Field names ending in "[]" must be passed without the trailing square 
+     * bracket characters, and must contain an array for its value.  This allows
+     * submitting multiple values with the same name, consider:
+     * 
+     * ```php
+     * $I->submitForm('#my-form', [
+     *     'field[]' => 'value',
+     *     'field[]' => 'another value', // 'field[]' is already a defined key
+     * ]);
+     * ```
+     * 
+     * The solution is to pass an array value:
+     * 
+     * ```php
+     * // this way both values are submitted
+     * $I->submitForm('#my-form', [
+     *     'field' => [
+     *         'value',
+     *         'another value',
+     *     ]
+     * ]);
+     * ```
+     * 
+     * @param $selector
+     * @param $params
+     * @param $button
+     * @see \Codeception\Lib\InnerBrowser::submitForm()
+     */
+    public function submitForm($selector, $params, $button = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('submitForm', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Fills a text field or textarea with the given string.
+     *
+     * ``` php
+     * <?php
+     * $I->fillField("//input[@type='text']", "Hello World!");
+     * $I->fillField(['name' => 'email'], 'jon@mail.com');
+     * ?>
+     * ```
+     *
+     * @param $field
+     * @param $value
+     * @see \Codeception\Lib\InnerBrowser::fillField()
+     */
+    public function fillField($field, $value) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('fillField', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Selects an option in a select tag or in radio button group.
+     *
+     * ``` php
+     * <?php
+     * $I->selectOption('form select[name=account]', 'Premium');
+     * $I->selectOption('form input[name=payment]', 'Monthly');
+     * $I->selectOption('//form/select[@name=account]', 'Monthly');
+     * ?>
+     * ```
+     *
+     * Provide an array for the second argument to select multiple options:
+     *
+     * ``` php
+     * <?php
+     * $I->selectOption('Which OS do you use?', array('Windows','Linux'));
+     * ?>
+     * ```
+     *
+     * @param $select
+     * @param $option
+     * @see \Codeception\Lib\InnerBrowser::selectOption()
+     */
+    public function selectOption($select, $option) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('selectOption', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Ticks a checkbox. For radio buttons, use the `selectOption` method instead.
+     *
+     * ``` php
+     * <?php
+     * $I->checkOption('#agree');
+     * ?>
+     * ```
+     *
+     * @param $option
+     * @see \Codeception\Lib\InnerBrowser::checkOption()
+     */
+    public function checkOption($option) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('checkOption', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Unticks a checkbox.
+     *
+     * ``` php
+     * <?php
+     * $I->uncheckOption('#notify');
+     * ?>
+     * ```
+     *
+     * @param $option
+     * @see \Codeception\Lib\InnerBrowser::uncheckOption()
+     */
+    public function uncheckOption($option) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('uncheckOption', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Attaches a file relative to the Codeception data directory to the given file upload field.
+     *
+     * ``` php
+     * <?php
+     * // file is stored in 'tests/_data/prices.xls'
+     * $I->attachFile('input[@type="file"]', 'prices.xls');
+     * ?>
+     * ```
+     *
+     * @param $field
+     * @param $filename
+     * @see \Codeception\Lib\InnerBrowser::attachFile()
+     */
+    public function attachFile($field, $filename) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('attachFile', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * If your page triggers an ajax request, you can perform it manually.
+     * This action sends a GET ajax request with specified params.
+     *
+     * See ->sendAjaxPostRequest for examples.
+     *
+     * @param $uri
+     * @param $params
+     * @see \Codeception\Lib\InnerBrowser::sendAjaxGetRequest()
+     */
+    public function sendAjaxGetRequest($uri, $params = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('sendAjaxGetRequest', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * If your page triggers an ajax request, you can perform it manually.
+     * This action sends a POST ajax request with specified params.
+     * Additional params can be passed as array.
+     *
+     * Example:
+     *
+     * Imagine that by clicking checkbox you trigger ajax request which updates user settings.
+     * We emulate that click by running this ajax request manually.
+     *
+     * ``` php
+     * <?php
+     * $I->sendAjaxPostRequest('/updateSettings', array('notifications' => true)); // POST
+     * $I->sendAjaxGetRequest('/updateSettings', array('notifications' => true)); // GET
+     *
+     * ```
+     *
+     * @param $uri
+     * @param $params
+     * @see \Codeception\Lib\InnerBrowser::sendAjaxPostRequest()
+     */
+    public function sendAjaxPostRequest($uri, $params = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('sendAjaxPostRequest', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * If your page triggers an ajax request, you can perform it manually.
+     * This action sends an ajax request with specified method and params.
+     *
+     * Example:
+     *
+     * You need to perform an ajax request specifying the HTTP method.
+     *
+     * ``` php
+     * <?php
+     * $I->sendAjaxRequest('PUT', '/posts/7', array('title' => 'new title'));
+     *
+     * ```
+     *
+     * @param $method
+     * @param $uri
+     * @param $params
+     * @see \Codeception\Lib\InnerBrowser::sendAjaxRequest()
+     */
+    public function sendAjaxRequest($method, $uri, $params = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('sendAjaxRequest', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Finds and returns the text contents of the given element.
+     * If a fuzzy locator is used, the element is found using CSS, XPath, and by matching the full page source by regular expression.
+     *
+     * ``` php
+     * <?php
+     * $heading = $I->grabTextFrom('h1');
+     * $heading = $I->grabTextFrom('descendant-or-self::h1');
+     * $value = $I->grabTextFrom('~<input value=(.*?)]~sgi'); // match with a regex
+     * ?>
+     * ```
+     *
+     * @param $cssOrXPathOrRegex
+     *
+     * @return mixed
+     * @see \Codeception\Lib\InnerBrowser::grabTextFrom()
+     */
+    public function grabTextFrom($cssOrXPathOrRegex) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('grabTextFrom', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Grabs the value of the given attribute value from the given element.
+     * Fails if element is not found.
+     *
+     * ``` php
+     * <?php
+     * $I->grabAttributeFrom('#tooltip', 'title');
+     * ?>
+     * ```
+     *
+     *
+     * @param $cssOrXpath
+     * @param $attribute
+     * @internal param $element
+     * @return mixed
+     * @see \Codeception\Lib\InnerBrowser::grabAttributeFrom()
+     */
+    public function grabAttributeFrom($cssOrXpath, $attribute) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('grabAttributeFrom', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     *
+     * @see \Codeception\Lib\InnerBrowser::grabMultiple()
+     */
+    public function grabMultiple($cssOrXpath, $attribute = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('grabMultiple', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * @param $field
+     *
+     * @return array|mixed|null|string
+     * @see \Codeception\Lib\InnerBrowser::grabValueFrom()
+     */
+    public function grabValueFrom($field) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('grabValueFrom', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Sets a cookie with the given name and value.
+     * You can set additional cookie params like `domain`, `path`, `expire`, `secure` in array passed as last argument.
+     *
+     * ``` php
+     * <?php
+     * $I->setCookie('PHPSESSID', 'el4ukv0kqbvoirg7nkp4dncpk3');
+     * ?>
+     * ```
+     *
+     * @param $name
+     * @param $val
+     * @param array $params
+     *
+     * @return mixed
+     * @see \Codeception\Lib\InnerBrowser::setCookie()
+     */
+    public function setCookie($name, $val, $params = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('setCookie', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Grabs a cookie value.
+     * You can set additional cookie params like `domain`, `path` in array passed as last argument.
+     *
+     * @param $cookie
+     *
+     * @param array $params
+     * @return mixed
+     * @see \Codeception\Lib\InnerBrowser::grabCookie()
+     */
+    public function grabCookie($cookie, $params = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('grabCookie', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that a cookie with the given name is set.
+     * You can set additional cookie params like `domain`, `path` as array passed in last argument.
+     *
+     * ``` php
+     * <?php
+     * $I->seeCookie('PHPSESSID');
+     * ?>
+     * ```
+     *
+     * @param $cookie
+     * @param array $params
+     * @return mixed
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Lib\InnerBrowser::seeCookie()
+     */
+    public function canSeeCookie($cookie, $params = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeCookie', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that a cookie with the given name is set.
+     * You can set additional cookie params like `domain`, `path` as array passed in last argument.
+     *
+     * ``` php
+     * <?php
+     * $I->seeCookie('PHPSESSID');
+     * ?>
+     * ```
+     *
+     * @param $cookie
+     * @param array $params
+     * @return mixed
+     * @see \Codeception\Lib\InnerBrowser::seeCookie()
+     */
+    public function seeCookie($cookie, $params = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeCookie', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that there isn't a cookie with the given name.
+     * You can set additional cookie params like `domain`, `path` as array passed in last argument.
+     *
+     * @param $cookie
+     *
+     * @param array $params
+     * @return mixed
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Lib\InnerBrowser::dontSeeCookie()
+     */
+    public function cantSeeCookie($cookie, $params = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeCookie', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that there isn't a cookie with the given name.
+     * You can set additional cookie params like `domain`, `path` as array passed in last argument.
+     *
+     * @param $cookie
+     *
+     * @param array $params
+     * @return mixed
+     * @see \Codeception\Lib\InnerBrowser::dontSeeCookie()
+     */
+    public function dontSeeCookie($cookie, $params = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeCookie', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Unsets cookie with the given name.
+     * You can set additional cookie params like `domain`, `path` in array passed as last argument.
+     *
+     * @param $cookie
+     *
+     * @param array $params
+     * @return mixed
+     * @see \Codeception\Lib\InnerBrowser::resetCookie()
+     */
+    public function resetCookie($name, $params = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('resetCookie', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that the given element exists on the page and is visible.
+     * You can also specify expected attributes of this element.
+     *
+     * ``` php
+     * <?php
+     * $I->seeElement('.error');
+     * $I->seeElement('//form/input[1]');
+     * $I->seeElement('input', ['name' => 'login']);
+     * $I->seeElement('input', ['value' => '123456']);
+     *
+     * // strict locator in first arg, attributes in second
+     * $I->seeElement(['css' => 'form input'], ['name' => 'login']);
+     * ?>
+     * ```
+     *
+     * @param $selector
+     * @param array $attributes
+     * @return
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Lib\InnerBrowser::seeElement()
+     */
+    public function canSeeElement($selector, $attributes = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeElement', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that the given element exists on the page and is visible.
+     * You can also specify expected attributes of this element.
+     *
+     * ``` php
+     * <?php
+     * $I->seeElement('.error');
+     * $I->seeElement('//form/input[1]');
+     * $I->seeElement('input', ['name' => 'login']);
+     * $I->seeElement('input', ['value' => '123456']);
+     *
+     * // strict locator in first arg, attributes in second
+     * $I->seeElement(['css' => 'form input'], ['name' => 'login']);
+     * ?>
+     * ```
+     *
+     * @param $selector
+     * @param array $attributes
+     * @return
+     * @see \Codeception\Lib\InnerBrowser::seeElement()
+     */
+    public function seeElement($selector, $attributes = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeElement', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that the given element is invisible or not present on the page.
+     * You can also specify expected attributes of this element.
+     *
+     * ``` php
+     * <?php
+     * $I->dontSeeElement('.error');
+     * $I->dontSeeElement('//form/input[1]');
+     * $I->dontSeeElement('input', ['name' => 'login']);
+     * $I->dontSeeElement('input', ['value' => '123456']);
+     * ?>
+     * ```
+     *
+     * @param $selector
+     * @param array $attributes
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Lib\InnerBrowser::dontSeeElement()
+     */
+    public function cantSeeElement($selector, $attributes = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeElement', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that the given element is invisible or not present on the page.
+     * You can also specify expected attributes of this element.
+     *
+     * ``` php
+     * <?php
+     * $I->dontSeeElement('.error');
+     * $I->dontSeeElement('//form/input[1]');
+     * $I->dontSeeElement('input', ['name' => 'login']);
+     * $I->dontSeeElement('input', ['value' => '123456']);
+     * ?>
+     * ```
+     *
+     * @param $selector
+     * @param array $attributes
+     * @see \Codeception\Lib\InnerBrowser::dontSeeElement()
+     */
+    public function dontSeeElement($selector, $attributes = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeElement', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that there are a certain number of elements matched by the given locator on the page.
+     *
+     * ``` php
+     * <?php
+     * $I->seeNumberOfElements('tr', 10);
+     * $I->seeNumberOfElements('tr', [0,10]); //between 0 and 10 elements
+     * ?>
+     * ```
+     * @param $selector
+     * @param mixed $expected :
+     * - string: strict number
+     * - array: range of numbers [0,10]
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Lib\InnerBrowser::seeNumberOfElements()
+     */
+    public function canSeeNumberOfElements($selector, $expected) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeNumberOfElements', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that there are a certain number of elements matched by the given locator on the page.
+     *
+     * ``` php
+     * <?php
+     * $I->seeNumberOfElements('tr', 10);
+     * $I->seeNumberOfElements('tr', [0,10]); //between 0 and 10 elements
+     * ?>
+     * ```
+     * @param $selector
+     * @param mixed $expected :
+     * - string: strict number
+     * - array: range of numbers [0,10]
+     * @see \Codeception\Lib\InnerBrowser::seeNumberOfElements()
+     */
+    public function seeNumberOfElements($selector, $expected) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeNumberOfElements', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that the given option is selected.
+     *
+     * ``` php
+     * <?php
+     * $I->seeOptionIsSelected('#form input[name=payment]', 'Visa');
+     * ?>
+     * ```
+     *
+     * @param $selector
+     * @param $optionText
+     *
+     * @return mixed
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Lib\InnerBrowser::seeOptionIsSelected()
+     */
+    public function canSeeOptionIsSelected($selector, $optionText) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeOptionIsSelected', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that the given option is selected.
+     *
+     * ``` php
+     * <?php
+     * $I->seeOptionIsSelected('#form input[name=payment]', 'Visa');
+     * ?>
+     * ```
+     *
+     * @param $selector
+     * @param $optionText
+     *
+     * @return mixed
+     * @see \Codeception\Lib\InnerBrowser::seeOptionIsSelected()
+     */
+    public function seeOptionIsSelected($selector, $optionText) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeOptionIsSelected', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that the given option is not selected.
+     *
+     * ``` php
+     * <?php
+     * $I->dontSeeOptionIsSelected('#form input[name=payment]', 'Visa');
+     * ?>
+     * ```
+     *
+     * @param $selector
+     * @param $optionText
+     *
+     * @return mixed
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Lib\InnerBrowser::dontSeeOptionIsSelected()
+     */
+    public function cantSeeOptionIsSelected($selector, $optionText) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeOptionIsSelected', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that the given option is not selected.
+     *
+     * ``` php
+     * <?php
+     * $I->dontSeeOptionIsSelected('#form input[name=payment]', 'Visa');
+     * ?>
+     * ```
+     *
+     * @param $selector
+     * @param $optionText
+     *
+     * @return mixed
+     * @see \Codeception\Lib\InnerBrowser::dontSeeOptionIsSelected()
+     */
+    public function dontSeeOptionIsSelected($selector, $optionText) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeOptionIsSelected', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Asserts that current page has 404 response status code.
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Lib\InnerBrowser::seePageNotFound()
+     */
+    public function canSeePageNotFound() {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seePageNotFound', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Asserts that current page has 404 response status code.
+     * @see \Codeception\Lib\InnerBrowser::seePageNotFound()
+     */
+    public function seePageNotFound() {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seePageNotFound', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that response code is equal to value provided.
+     *
+     * @param $code
+     *
+     * @return mixed
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Lib\InnerBrowser::seeResponseCodeIs()
+     */
+    public function canSeeResponseCodeIs($code) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeResponseCodeIs', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that response code is equal to value provided.
+     *
+     * @param $code
+     *
+     * @return mixed
+     * @see \Codeception\Lib\InnerBrowser::seeResponseCodeIs()
+     */
+    public function seeResponseCodeIs($code) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeResponseCodeIs', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that the page title contains the given string.
+     *
+     * ``` php
+     * <?php
+     * $I->seeInTitle('Blog - Post #1');
+     * ?>
+     * ```
+     *
+     * @param $title
+     *
+     * @return mixed
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Lib\InnerBrowser::seeInTitle()
+     */
+    public function canSeeInTitle($title) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeInTitle', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that the page title contains the given string.
+     *
+     * ``` php
+     * <?php
+     * $I->seeInTitle('Blog - Post #1');
+     * ?>
+     * ```
+     *
+     * @param $title
+     *
+     * @return mixed
+     * @see \Codeception\Lib\InnerBrowser::seeInTitle()
+     */
+    public function seeInTitle($title) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeInTitle', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that the page title does not contain the given string.
+     *
+     * @param $title
+     *
+     * @return mixed
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Lib\InnerBrowser::dontSeeInTitle()
+     */
+    public function cantSeeInTitle($title) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeInTitle', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that the page title does not contain the given string.
+     *
+     * @param $title
+     *
+     * @return mixed
+     * @see \Codeception\Lib\InnerBrowser::dontSeeInTitle()
+     */
+    public function dontSeeInTitle($title) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeInTitle', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Provides access the Laravel application object.
+     *
+     * @return \Illuminate\Foundation\Application
+     * @see \Codeception\Module\Laravel5::getApplication()
+     */
+    public function getApplication() {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('getApplication', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * @param $app
+     * @see \Codeception\Module\Laravel5::setApplication()
+     */
+    public function setApplication($app) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('setApplication', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Disable middleware for the next requests.
+     *
+     * ``` php
+     * <?php
+     * $I->disableMiddleware();
+     * ?>
+     * ```
+     * @see \Codeception\Module\Laravel5::disableMiddleware()
+     */
+    public function disableMiddleware() {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('disableMiddleware', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Enable middleware for the next requests.
+     *
+     * ``` php
+     * <?php
+     * $I->enableMiddleware();
+     * ?>
+     * ```
+     * @see \Codeception\Module\Laravel5::enableMiddleware()
+     */
+    public function enableMiddleware() {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('enableMiddleware', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Opens web page using route name and parameters.
+     *
+     * ``` php
+     * <?php
+     * $I->amOnRoute('posts.create');
+     * ?>
+     * ```
+     *
+     * @param $routeName
+     * @param array $params
+     * @see \Codeception\Module\Laravel5::amOnRoute()
+     */
+    public function amOnRoute($routeName, $params = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Condition('amOnRoute', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Opens web page by action name
+     *
+     * ``` php
+     * <?php
+     * $I->amOnAction('PostsController@index');
+     * ?>
+     * ```
+     *
+     * @param $action
+     * @param array $params
+     * @see \Codeception\Module\Laravel5::amOnAction()
+     */
+    public function amOnAction($action, $params = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Condition('amOnAction', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that current url matches route
+     *
+     * ``` php
+     * <?php
+     * $I->seeCurrentRouteIs('posts.index');
+     * ?>
+     * ```
+     * @param $route
+     * @param array $params
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Module\Laravel5::seeCurrentRouteIs()
+     */
+    public function canSeeCurrentRouteIs($route, $params = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeCurrentRouteIs', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that current url matches route
+     *
+     * ``` php
+     * <?php
+     * $I->seeCurrentRouteIs('posts.index');
+     * ?>
+     * ```
+     * @param $route
+     * @param array $params
+     * @see \Codeception\Module\Laravel5::seeCurrentRouteIs()
+     */
+    public function seeCurrentRouteIs($route, $params = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeCurrentRouteIs', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that current url matches action
+     *
+     * ``` php
+     * <?php
+     * $I->seeCurrentActionIs('PostsController@index');
+     * ?>
+     * ```
+     *
+     * @param $action
+     * @param array $params
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Module\Laravel5::seeCurrentActionIs()
+     */
+    public function canSeeCurrentActionIs($action, $params = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeCurrentActionIs', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that current url matches action
+     *
+     * ``` php
+     * <?php
+     * $I->seeCurrentActionIs('PostsController@index');
+     * ?>
+     * ```
+     *
+     * @param $action
+     * @param array $params
+     * @see \Codeception\Module\Laravel5::seeCurrentActionIs()
+     */
+    public function seeCurrentActionIs($action, $params = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeCurrentActionIs', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Assert that a session variable exists.
+     *
+     * ``` php
+     * <?php
+     * $I->seeInSession('key');
+     * $I->seeInSession('key', 'value');
+     * ?>
+     * ```
+     *
+     * @param  string|array $key
+     * @param  mixed $value
+     * @return void
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Module\Laravel5::seeInSession()
+     */
+    public function canSeeInSession($key, $value = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeInSession', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Assert that a session variable exists.
+     *
+     * ``` php
+     * <?php
+     * $I->seeInSession('key');
+     * $I->seeInSession('key', 'value');
+     * ?>
+     * ```
+     *
+     * @param  string|array $key
+     * @param  mixed $value
+     * @return void
+     * @see \Codeception\Module\Laravel5::seeInSession()
+     */
+    public function seeInSession($key, $value = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeInSession', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Assert that the session has a given list of values.
+     *
+     * ``` php
+     * <?php
+     * $I->seeSessionHasValues(['key1', 'key2']);
+     * $I->seeSessionHasValues(['key1' => 'value1', 'key2' => 'value2']);
+     * ?>
+     * ```
+     *
+     * @param  array $bindings
+     * @return void
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Module\Laravel5::seeSessionHasValues()
+     */
+    public function canSeeSessionHasValues($bindings) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeSessionHasValues', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Assert that the session has a given list of values.
+     *
+     * ``` php
+     * <?php
+     * $I->seeSessionHasValues(['key1', 'key2']);
+     * $I->seeSessionHasValues(['key1' => 'value1', 'key2' => 'value2']);
+     * ?>
+     * ```
+     *
+     * @param  array $bindings
+     * @return void
+     * @see \Codeception\Module\Laravel5::seeSessionHasValues()
+     */
+    public function seeSessionHasValues($bindings) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeSessionHasValues', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Assert that form errors are bound to the View.
+     *
+     * ``` php
+     * <?php
+     * $I->seeFormHasErrors();
+     * ?>
+     * ```
+     *
+     * @return bool
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Module\Laravel5::seeFormHasErrors()
+     */
+    public function canSeeFormHasErrors() {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeFormHasErrors', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Assert that form errors are bound to the View.
+     *
+     * ``` php
+     * <?php
+     * $I->seeFormHasErrors();
+     * ?>
+     * ```
+     *
+     * @return bool
+     * @see \Codeception\Module\Laravel5::seeFormHasErrors()
+     */
+    public function seeFormHasErrors() {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeFormHasErrors', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Assert that specific form error messages are set in the view.
+     *
+     * Useful for validation messages e.g.
+     *  return `Redirect::to('register')->withErrors($validator);`
+     *
+     * Example of Usage
+     *
+     * ``` php
+     * <?php
+     * $I->seeFormErrorMessages(array('username'=>'Invalid Username'));
+     * ?>
+     * ```
+     * @param array $bindings
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Module\Laravel5::seeFormErrorMessages()
+     */
+    public function canSeeFormErrorMessages($bindings) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeFormErrorMessages', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Assert that specific form error messages are set in the view.
+     *
+     * Useful for validation messages e.g.
+     *  return `Redirect::to('register')->withErrors($validator);`
+     *
+     * Example of Usage
+     *
+     * ``` php
+     * <?php
+     * $I->seeFormErrorMessages(array('username'=>'Invalid Username'));
+     * ?>
+     * ```
+     * @param array $bindings
+     * @see \Codeception\Module\Laravel5::seeFormErrorMessages()
+     */
+    public function seeFormErrorMessages($bindings) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeFormErrorMessages', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Assert that specific form error message is set in the view.
+     *
+     * Useful for validation messages and generally messages array
+     *  e.g.
+     *  return `Redirect::to('register')->withErrors($validator);`
+     *
+     * Example of Usage
+     *
+     * ``` php
+     * <?php
+     * $I->seeFormErrorMessage('username', 'Invalid Username');
+     * ?>
+     * ```
+     * @param string $key
+     * @param string $errorMessage
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Module\Laravel5::seeFormErrorMessage()
+     */
+    public function canSeeFormErrorMessage($key, $errorMessage) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeFormErrorMessage', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Assert that specific form error message is set in the view.
+     *
+     * Useful for validation messages and generally messages array
+     *  e.g.
+     *  return `Redirect::to('register')->withErrors($validator);`
+     *
+     * Example of Usage
+     *
+     * ``` php
+     * <?php
+     * $I->seeFormErrorMessage('username', 'Invalid Username');
+     * ?>
+     * ```
+     * @param string $key
+     * @param string $errorMessage
+     * @see \Codeception\Module\Laravel5::seeFormErrorMessage()
+     */
+    public function seeFormErrorMessage($key, $errorMessage) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeFormErrorMessage', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Set the currently logged in user for the application.
+     * Takes either an object that implements the User interface or
+     * an array of credentials.
+     *
+     * @param  \Illuminate\Contracts\Auth\User|array $user
+     * @param  string $driver
+     * @return void
+     * @see \Codeception\Module\Laravel5::amLoggedAs()
+     */
+    public function amLoggedAs($user, $driver = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Condition('amLoggedAs', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Logs user out
+     * @see \Codeception\Module\Laravel5::logout()
+     */
+    public function logout() {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('logout', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that user is authenticated
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Module\Laravel5::seeAuthentication()
+     */
+    public function canSeeAuthentication() {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeAuthentication', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that user is authenticated
+     * @see \Codeception\Module\Laravel5::seeAuthentication()
+     */
+    public function seeAuthentication() {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeAuthentication', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Check that user is not authenticated
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Module\Laravel5::dontSeeAuthentication()
+     */
+    public function cantSeeAuthentication() {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeAuthentication', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Check that user is not authenticated
+     * @see \Codeception\Module\Laravel5::dontSeeAuthentication()
+     */
+    public function dontSeeAuthentication() {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeAuthentication', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Return an instance of a class from the IoC Container.
+     * (http://laravel.com/docs/ioc)
+     *
+     * Example
+     * ``` php
+     * <?php
+     * // In Laravel
+     * App::bind('foo', function($app)
+     * {
+     *     return new FooBar;
+     * });
+     *
+     * // Then in test
+     * $service = $I->grabService('foo');
+     *
+     * // Will return an instance of FooBar, also works for singletons.
+     * ?>
+     * ```
+     *
+     * @param  string $class
+     * @return mixed
+     * @see \Codeception\Module\Laravel5::grabService()
+     */
+    public function grabService($class) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('grabService', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Inserts record into the database.
+     *
+     * ``` php
+     * <?php
+     * $user_id = $I->haveRecord('users', array('name' => 'Davert'));
+     * ?>
+     * ```
+     *
+     * @param $tableName
+     * @param array $attributes
+     * @return mixed
+     * @part orm
+     * @see \Codeception\Module\Laravel5::haveRecord()
+     */
+    public function haveRecord($tableName, $attributes = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('haveRecord', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that record exists in database.
+     *
+     * ``` php
+     * <?php
+     * $I->seeRecord('users', array('name' => 'davert'));
+     * ?>
+     * ```
+     *
+     * @param $tableName
+     * @param array $attributes
+     * @part orm
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Module\Laravel5::seeRecord()
+     */
+    public function canSeeRecord($tableName, $attributes = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeRecord', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that record exists in database.
+     *
+     * ``` php
+     * <?php
+     * $I->seeRecord('users', array('name' => 'davert'));
+     * ?>
+     * ```
+     *
+     * @param $tableName
+     * @param array $attributes
+     * @part orm
+     * @see \Codeception\Module\Laravel5::seeRecord()
+     */
+    public function seeRecord($tableName, $attributes = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeRecord', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that record does not exist in database.
+     *
+     * ``` php
+     * <?php
+     * $I->dontSeeRecord('users', array('name' => 'davert'));
+     * ?>
+     * ```
+     *
+     * @param $tableName
+     * @param array $attributes
+     * @part orm
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Module\Laravel5::dontSeeRecord()
+     */
+    public function cantSeeRecord($tableName, $attributes = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeRecord', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that record does not exist in database.
+     *
+     * ``` php
+     * <?php
+     * $I->dontSeeRecord('users', array('name' => 'davert'));
+     * ?>
+     * ```
+     *
+     * @param $tableName
+     * @param array $attributes
+     * @part orm
+     * @see \Codeception\Module\Laravel5::dontSeeRecord()
+     */
+    public function dontSeeRecord($tableName, $attributes = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeRecord', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Retrieves record from database
+     *
+     * ``` php
+     * <?php
+     * $category = $I->grabRecord('users', array('name' => 'davert'));
+     * ?>
+     * ```
+     *
+     * @param $tableName
+     * @param array $attributes
+     * @return mixed
+     * @part orm
+     * @see \Codeception\Module\Laravel5::grabRecord()
+     */
+    public function grabRecord($tableName, $attributes = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('grabRecord', func_get_args()));
+    }
 }
diff --git a/tests/acceptance/ChartsAndReportsCest.php b/tests/acceptance/ChartsAndReportsCest.php
index 9d8b0309b200..19c0b8a1b8c5 100644
--- a/tests/acceptance/ChartsAndReportsCest.php
+++ b/tests/acceptance/ChartsAndReportsCest.php
@@ -25,7 +25,7 @@ class ChartsAndReportsCest
 
         $faker = Faker\Factory::create();
 
-        $I->wantTo("Run the report");
+        $I->wantTo('Run the report');
 
 		$I->amOnPage('/company/advanced_settings/charts_and_reports');
  
diff --git a/tests/acceptance/GatewayCest.php b/tests/acceptance/GatewayCest.php
deleted file mode 100644
index 1fac7ac8baa4..000000000000
--- a/tests/acceptance/GatewayCest.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-use \AcceptanceTester;
-use Faker\Factory;
-
-class GatewayCest
-{
-    private $faker;
-
-    public function _before(AcceptanceTester $I)
-    {
-        $I->checkIfLogin($I);
-
-        $this->faker = Factory::create();
-    }
-
-
-    // tests
-    public function create(AcceptanceTester $I)
-    {
-        $I->wantTo("create a gateway");
-        $I->amOnPage('/gateways/create');
-        $I->seeCurrentUrlEquals('/gateways/create');
-
-        $I->fillField(['name' => '23_apiKey'], $this->faker->swiftBicNumber);
-        $I->click('Save');
-        
-        $I->see('Successfully created gateway');
-        $I->seeInDatabase('account_gateways', array('gateway_id' => 23));
-    }
-}
diff --git a/tests/acceptance/InvoiceCest.php b/tests/acceptance/InvoiceCest.php
index 4d6a93142b4d..ad7a4048be80 100644
--- a/tests/acceptance/InvoiceCest.php
+++ b/tests/acceptance/InvoiceCest.php
@@ -47,20 +47,24 @@ class InvoiceCest
         $I->amOnPage('/recurring_invoices/create');
 
         $I->selectDropdown($I, $clientName, '.client_select .dropdown-toggle');
-        //$I->selectOption('#frequency_id', Helper::getRandom('Frequency'));
-        $I->selectDataPicker($I, '#start_date');
         $I->selectDataPicker($I, '#end_date', '+ 1 week');
-
         $I->fillField('#po_number', rand(100, 200));
         $I->fillField('#discount', rand(0, 20));
-
+        
         $this->fillItems($I);
-
-        $I->executeJS('submitAction()');
+        
+        $I->executeJS("submitAction('email')");
         $I->wait(1);
         $I->see($clientName);
-    }    
 
+        $invoiceNumber = $I->grabAttributeFrom('#invoice_number', 'value');
+        $I->click('Recurring Invoice');
+        $I->see($clientName);
+
+        $I->click('#lastInvoiceSent');
+        $I->see($invoiceNumber);
+    }
+    
     public function editInvoice(AcceptanceTester $I)
     {
         $I->wantTo('edit an invoice');
@@ -111,25 +115,6 @@ class InvoiceCest
     }
     */
 
-    /*
-    public function indexInvoice(AcceptanceTester $I)
-    {
-        $I->wantTo('list invoices');
-
-        $I->amOnPage('/invoices');
-        $I->seeCurrentUrlEquals('/invoices');
-
-        $random_invoice_number = Helper::getRandom('Invoice', 'invoice_number', [
-            'is_quote' => 0,
-            'is_recurring' => false
-        ]);
-
-        if ($random_invoice_number) {
-            $I->wait(2);
-            $I->see($random_invoice_number);
-        }
-    }
-    */
 
     private function fillItems(AcceptanceTester $I, $max = 2)
     {
diff --git a/tests/acceptance/PaymentCest.php b/tests/acceptance/PaymentCest.php
index 325821891797..cd8664505ccb 100644
--- a/tests/acceptance/PaymentCest.php
+++ b/tests/acceptance/PaymentCest.php
@@ -20,7 +20,7 @@ class PaymentCest
         $clientName = $I->grabFromDatabase('clients', 'name');
         $amount = rand(1, 30);
 
-        $I->wantTo("enter a payment");
+        $I->wantTo('enter a payment');
         $I->amOnPage('/payments/create');
 
         $I->selectDropdown($I,  $clientName, '.client-select .dropdown-toggle');
@@ -40,7 +40,7 @@ class PaymentCest
     {
         $ref = $this->faker->text(12);
         
-        $I->wantTo("edit a payment");
+        $I->wantTo('edit a payment');
         $I->amOnPage('/payments/1/edit');
 
         $I->selectDataPicker($I, '#payment_date', 'now + 2 day');
@@ -52,7 +52,7 @@ class PaymentCest
 
     public function listPayments(AcceptanceTester $I)
     {
-        $I->wantTo("list payments");
+        $I->wantTo('list payments');
         $I->amOnPage('/payments');
 
         $I->seeNumberOfElements('tbody tr[role=row]', [1, 10]);
diff --git a/tests/acceptance/TaskCest.php b/tests/acceptance/TaskCest.php
index f2fb36e04930..1ec4c57e6a27 100644
--- a/tests/acceptance/TaskCest.php
+++ b/tests/acceptance/TaskCest.php
@@ -69,7 +69,7 @@ class TaskCest
 
     public function listTasks(AcceptanceTester $I)
     {
-        $I->wantTo("list tasks");
+        $I->wantTo('list tasks');
         $I->amOnPage('/tasks');
 
         $I->seeNumberOfElements('tbody tr[role=row]', [1, 10]);
diff --git a/tests/functional.suite.yml b/tests/functional.suite.yml
index 075765bd9009..809044371ff4 100644
--- a/tests/functional.suite.yml
+++ b/tests/functional.suite.yml
@@ -7,5 +7,9 @@
 class_name: FunctionalTester
 modules:
     enabled:
-        # add framework module here
-        - \Helper\Functional
\ No newline at end of file
+        - \Helper\Functional
+        - PhpBrowser:
+            url: 'http://ninja.dev/'
+        - Laravel5:
+            environment_file: '.env'
+            cleanup: false
\ No newline at end of file
diff --git a/tests/functional/SettingsCest.php b/tests/functional/SettingsCest.php
new file mode 100644
index 000000000000..a0c71f419011
--- /dev/null
+++ b/tests/functional/SettingsCest.php
@@ -0,0 +1,193 @@
+<?php
+
+use \FunctionalTester;
+use Faker\Factory;
+
+class SettingsCest
+{
+    private $faker;
+
+    public function _before(FunctionalTester $I)
+    {
+        $I->checkIfLogin($I);
+
+        $this->faker = Factory::create();
+    }
+
+    public function companyDetails(FunctionalTester $I)
+    {
+        $I->wantTo('update the company details');
+        $I->amOnPage('/company/details');
+
+        $name = $this->faker->company;
+
+        $I->fillField(['name' => 'name'], $name);
+        $I->fillField(['name' => 'work_email'], $this->faker->safeEmail);
+        $I->fillField(['name' => 'work_phone'], $this->faker->phoneNumber);
+        $I->fillField(['name' => 'address1'], $this->faker->buildingNumber . ' ' . $this->faker->streetName);
+        $I->fillField(['name' => 'address2'], $this->faker->secondaryAddress);
+        $I->fillField(['name' => 'city'], $this->faker->city);
+        $I->fillField(['name' => 'state'], $this->faker->state);
+        $I->fillField(['name' => 'postal_code'], $this->faker->postcode);
+
+        $I->fillField(['name' => 'first_name'], $this->faker->firstName);
+        $I->fillField(['name' => 'last_name'], $this->faker->lastName);
+        $I->fillField(['name' => 'phone'], $this->faker->phoneNumber);
+        $I->click('Save');
+
+        $I->seeResponseCodeIs(200);
+        $I->see('Successfully updated settings');
+        $I->seeRecord('accounts', array('name' => $name));
+    }
+
+    public function productSettings(FunctionalTester $I)
+    {
+        $I->wantTo('update the product settings');
+        $I->amOnPage('/company/products');
+
+        $I->click('Save');
+
+        $I->seeResponseCodeIs(200);
+        $I->see('Successfully updated settings');
+    }
+
+    public function onlinePayments(FunctionalTester $I)
+    {
+        $gateway = $I->grabRecord('account_gateways', array('gateway_id' => 23));
+
+        if (!$gateway) {
+            $apiKey = $this->faker->swiftBicNumber;
+
+            $I->wantTo('create a gateway');
+            $I->amOnPage('/gateways/create');
+            $I->seeCurrentUrlEquals('/gateways/create');
+
+            $I->fillField(['name' => '23_apiKey'], $apiKey);
+            $I->click('Save');
+            
+            $I->seeResponseCodeIs(200);
+            $I->see('Successfully created gateway');
+            $I->seeRecord('account_gateways', array('gateway_id' => 23));
+        } else {
+            $config = json_decode($gateway->config);
+            $apiKey = $config->apiKey;
+        }
+
+        /*
+        $I->amOnPage('/gateways/1/edit');
+        $I->click('Save');
+            
+        $I->seeResponseCodeIs(200);
+        $I->see('Successfully updated gateway');
+        $I->seeRecord('account_gateways', array('config' => '{"apiKey":"ASHHOWAH"}'));
+        */
+    }
+
+    public function createProduct(FunctionalTester $I)
+    {
+        $I->wantTo('create a product');
+        $I->amOnPage('/products/create');
+
+        $productKey = $this->faker->text(10);
+
+        $I->fillField(['name' => 'product_key'], $productKey);
+        $I->fillField(['name' => 'notes'], $this->faker->text(80));
+        $I->fillField(['name' => 'cost'], $this->faker->numberBetween(1,20));
+        $I->click('Save');
+
+        $I->seeResponseCodeIs(200);
+        $I->see('Successfully created product');
+        $I->seeRecord('products', array('product_key' => $productKey));
+    }
+
+    public function updateProduct(FunctionalTester $I) 
+    {
+        return;
+
+        $I->wantTo('update a product');
+        $I->amOnPage('/products/1/edit');
+
+        $productKey = $this->faker->text(10);
+
+        $I->fillField(['name' => 'product_key'], $productKey);
+        $I->click('Save');
+
+        $I->seeResponseCodeIs(200);
+        $I->see('Successfully updated product');
+        $I->seeRecord('products', array('product_key' => $productKey));
+    }
+
+    public function updateNotifications(FunctionalTester $I)
+    {
+        $I->wantTo('update notification settings');
+        $I->amOnPage('/company/notifications');
+
+        $terms = $this->faker->text(80);
+
+        $I->fillField(['name' => 'invoice_terms'], $terms);
+        $I->fillField(['name' => 'invoice_footer'], $this->faker->text(60));
+        $I->click('Save');
+
+        $I->seeResponseCodeIs(200);
+        $I->see('Successfully updated settings');
+        $I->seeRecord('accounts', array('invoice_terms' => $terms));
+    }
+
+    public function updateInvoiceDesign(FunctionalTester $I)
+    {
+        $I->wantTo('update invoice design');
+        $I->amOnPage('/company/advanced_settings/invoice_design');
+
+        $color = $this->faker->hexcolor;
+
+        $I->fillField(['name' => 'labels_item'], $this->faker->text(14));
+        $I->fillField(['name' => 'primary_color'], $color);
+        $I->click('Save');
+
+        $I->seeResponseCodeIs(200);
+        $I->see('Successfully updated settings');
+        $I->seeRecord('accounts', array('primary_color' => $color));
+    }
+
+    public function updateInvoiceSettings(FunctionalTester $I)
+    {
+        $I->wantTo('update invoice settings');
+        $I->amOnPage('/company/advanced_settings/invoice_settings');
+
+        $label = $this->faker->text(10);
+
+        $I->fillField(['name' => 'custom_client_label1'], $label);
+        $I->click('Save');
+
+        $I->seeResponseCodeIs(200);
+        $I->see('Successfully updated settings');
+        $I->seeRecord('accounts', array('custom_client_label1' => $label));
+
+        $I->amOnPage('/clients/create');
+        $I->see($label);
+    }
+
+    public function updateEmailTemplates(FunctionalTester $I)
+    {
+        $I->wantTo('update email templates');
+        $I->amOnPage('/company/advanced_settings/email_templates');
+
+        $string = $this->faker->text(100);
+
+        $I->fillField(['name' => 'email_template_payment'], $string);
+        $I->click('Save');
+
+        $I->seeResponseCodeIs(200);
+        $I->see('Successfully updated settings');
+        $I->seeRecord('accounts', array('email_template_payment' => $string));
+    }
+
+    public function runReport(FunctionalTester $I)
+    {
+        $I->wantTo('run the report');
+        $I->amOnPage('/company/advanced_settings/charts_and_reports');
+
+        $I->click('Run');
+        $I->seeResponseCodeIs(200);
+    }
+}