diff --git a/app/Http/Controllers/Transaction/ConvertController.php b/app/Http/Controllers/Transaction/ConvertController.php
index b01335dce7..196d6b5efd 100644
--- a/app/Http/Controllers/Transaction/ConvertController.php
+++ b/app/Http/Controllers/Transaction/ConvertController.php
@@ -85,7 +85,7 @@ class ConvertController extends Controller
 
         // cannot convert split.
         if ($journal->transactions()->count() > 2) {
-            Session::flash('error', trans('firefly.cannot_convert_split_journl'));
+            Session::flash('error', trans('firefly.cannot_convert_split_journal'));
 
             return redirect(route('transactions.show', [$journal->id]));
         }
@@ -134,7 +134,7 @@ class ConvertController extends Controller
         }
 
         if ($journal->transactions()->count() > 2) {
-            Session::flash('error', trans('firefly.cannot_convert_split_journl'));
+            Session::flash('error', trans('firefly.cannot_convert_split_journal'));
 
             return redirect(route('transactions.show', [$journal->id]));
         }
@@ -185,7 +185,7 @@ class ConvertController extends Controller
             case TransactionType::DEPOSIT . '-' . TransactionType::WITHDRAWAL:
             case TransactionType::TRANSFER . '-' . TransactionType::WITHDRAWAL:
                 // three and five
-                if ($data['destination_account_expense'] === '') {
+                if ($data['destination_account_expense'] === '' || is_null($data['destination_account_expense'])) {
                     // destination is a cash account.
                     $destination = $accountRepository->getCashAccount();
 
@@ -232,7 +232,7 @@ class ConvertController extends Controller
             case TransactionType::WITHDRAWAL . '-' . TransactionType::DEPOSIT:
             case TransactionType::TRANSFER . '-' . TransactionType::DEPOSIT:
 
-                if ($data['source_account_revenue'] === '') {
+                if ($data['source_account_revenue'] === '' || is_null($data['source_account_revenue'])) {
                     // destination is a cash account.
                     $destination = $accountRepository->getCashAccount();
 
diff --git a/app/Http/Requests/AttachmentFormRequest.php b/app/Http/Requests/AttachmentFormRequest.php
index 30d2fe6d2b..d51a1b4a15 100644
--- a/app/Http/Requests/AttachmentFormRequest.php
+++ b/app/Http/Requests/AttachmentFormRequest.php
@@ -49,9 +49,9 @@ class AttachmentFormRequest extends Request
     {
 
         return [
-            'title'       => 'between:1,255',
-            'description' => 'between:1,65536',
-            'notes'       => 'between:1,65536',
+            'title'       => 'between:1,255|nullable',
+            'description' => 'between:1,65536|nullable',
+            'notes'       => 'between:1,65536|nullable',
         ];
     }
 }
diff --git a/app/Http/Requests/JournalFormRequest.php b/app/Http/Requests/JournalFormRequest.php
index f38acfbc4d..aeadae21a6 100644
--- a/app/Http/Requests/JournalFormRequest.php
+++ b/app/Http/Requests/JournalFormRequest.php
@@ -108,9 +108,9 @@ class JournalFormRequest extends Request
             'piggy_bank_id'            => 'between:1,255',
 
             // foreign currency amounts
-            'native_amount'            => 'numeric|more:0',
-            'source_amount'            => 'numeric|more:0',
-            'destination_amount'       => 'numeric',
+            'native_amount'            => 'numeric|more:0|nullable',
+            'source_amount'            => 'numeric|more:0|nullable',
+            'destination_amount'       => 'numeric|more:0|nullable',
         ];
 
         // some rules get an upgrade depending on the type of data:
diff --git a/app/Http/Requests/RuleGroupFormRequest.php b/app/Http/Requests/RuleGroupFormRequest.php
index 4e94676e23..952025c558 100644
--- a/app/Http/Requests/RuleGroupFormRequest.php
+++ b/app/Http/Requests/RuleGroupFormRequest.php
@@ -57,7 +57,7 @@ class RuleGroupFormRequest extends Request
 
         return [
             'title'       => $titleRule,
-            'description' => 'between:1,5000',
+            'description' => 'between:1,5000|nullable',
         ];
     }
 }
diff --git a/resources/lang/en_US/firefly.php b/resources/lang/en_US/firefly.php
index a823067ec7..e92ca4a27b 100644
--- a/resources/lang/en_US/firefly.php
+++ b/resources/lang/en_US/firefly.php
@@ -942,6 +942,7 @@ return [
     'cannot_edit_multiple_dest'             => 'You cannot edit splitted transaction #:id with description ":description" because it contains multiple destination accounts.',
     'cannot_edit_opening_balance'           => 'You cannot edit the opening balance of an account.',
     'no_edit_multiple_left'                 => 'You have selected no valid transactions to edit.',
+    'cannot_convert_split_journl'           => 'Cannot convert a split transaction',
 
     // import bread crumbs and titles:
     'import'                                => 'Import',
diff --git a/tests/Feature/Controllers/AttachmentControllerTest.php b/tests/Feature/Controllers/AttachmentControllerTest.php
index af2c294fd4..2088d98c9d 100644
--- a/tests/Feature/Controllers/AttachmentControllerTest.php
+++ b/tests/Feature/Controllers/AttachmentControllerTest.php
@@ -138,8 +138,8 @@ class AttachmentControllerTest extends TestCase
         $this->session(['attachments.edit.uri' => 'http://localhost']);
         $data = [
             'title'       => 'Some updated title ' . rand(1000, 9999),
-            'notes'       => '',
-            'description' => '',
+            'notes'       => 'A',
+            'description' => 'B',
         ];
 
         $this->be($this->user());
diff --git a/tests/Feature/Controllers/Chart/BudgetReportControllerTest.php b/tests/Feature/Controllers/Chart/BudgetReportControllerTest.php
index 4edc642a6a..99ed8ff842 100644
--- a/tests/Feature/Controllers/Chart/BudgetReportControllerTest.php
+++ b/tests/Feature/Controllers/Chart/BudgetReportControllerTest.php
@@ -24,7 +24,6 @@ use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionType;
 use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
 use Illuminate\Support\Collection;
-use Log;
 use Tests\TestCase;
 
 /**
@@ -104,8 +103,6 @@ class BudgetReportControllerTest extends TestCase
         $transaction->amount              = '-100';
         $transaction->opposing_account_id = 8;
 
-        Log::debug('Transaction', $transaction->toArray());
-
         $budgetRepos->shouldReceive('getAllBudgetLimits')->andReturn(new Collection([$one, $two]))->once();
 
 
diff --git a/tests/Feature/Controllers/RuleGroupControllerTest.php b/tests/Feature/Controllers/RuleGroupControllerTest.php
index 59ea1f075a..09cbfe582b 100644
--- a/tests/Feature/Controllers/RuleGroupControllerTest.php
+++ b/tests/Feature/Controllers/RuleGroupControllerTest.php
@@ -176,7 +176,7 @@ class RuleGroupControllerTest extends TestCase
         $repository->shouldReceive('find')->andReturn(new RuleGroup);
         $data = [
             'title'       => 'A',
-            'description' => '',
+            'description' => 'No description',
         ];
 
 
diff --git a/tests/Feature/ExampleTest.php b/tests/Feature/ExampleTest.php
index f31e495ca3..6eb72b6d40 100644
--- a/tests/Feature/ExampleTest.php
+++ b/tests/Feature/ExampleTest.php
@@ -14,7 +14,7 @@ class ExampleTest extends TestCase
      */
     public function testBasicTest()
     {
-        $response = $this->get('/');
+        $response = $this->get('/login');
 
         $response->assertStatus(200);
     }