diff --git a/src/Form/GoogleCurrencyConverterForm.php b/src/Form/GoogleCurrencyConverterForm.php
index 29e0914..3c8259f 100644
--- a/src/Form/GoogleCurrencyConverterForm.php
+++ b/src/Form/GoogleCurrencyConverterForm.php
@@ -76,7 +76,10 @@ class GoogleCurrencyConverterForm extends FormBase {
       '#required' => TRUE,
     );
     $form['actions'] = array('#type' => 'actions');
-    $form['actions']['submit'] = array('#type' => 'submit', '#value' => $this->t('Convert'));
+    $form['actions']['submit'] = array(
+      '#type' => 'submit',
+      '#value' => $this->t('Convert'),
+    );
     $form['#validate'][] = '::validateFinal';
     return $form;
   }
@@ -98,7 +101,14 @@ class GoogleCurrencyConverterForm extends FormBase {
     $to = $form_state->getValue('google_currency_converter_to');
     $amount = $form_state->getValue('amount');
     $result = $this->googleCurrencyConveter->convertAmount($amount, $from, $to);
-    $output = $this->t('Your selected value is from @value_from to @value_to amount is @value_amount @value_from & your converted value is @result @value_to', array('@value_from' => $from, '@value_to' => $to, '@value_amount' => $amount, '@result' => $result));
+
+    $arguments = array(
+      '@value_from' => $from,
+      '@value_to' => $to,
+      '@value_amount' => $amount,
+      '@result' => $result,
+    );
+    $output = $this->t('Your selected value is from @value_from to @value_to amount is @value_amount @value_from & your converted value is @result @value_to', $arguments);
     drupal_set_message($output);
   }
 
diff --git a/src/GoogleCurrencyConverterManager.php b/src/GoogleCurrencyConverterManager.php
index a989464..cad40a4 100644
--- a/src/GoogleCurrencyConverterManager.php
+++ b/src/GoogleCurrencyConverterManager.php
@@ -16,6 +16,7 @@ use Drupal\Core\StringTranslation\StringTranslationTrait;
  * @package Drupal\google_currency_converter
  */
 class GoogleCurrencyConverterManager implements GoogleCurrencyConverterManagerInterface {
+
   use StringTranslationTrait;
 
   /**
@@ -35,9 +36,9 @@ class GoogleCurrencyConverterManager implements GoogleCurrencyConverterManagerIn
     // Google currency converter widget
     // Base URL: https://www.google.com/finance/converter
     // Query Parameters:
-    //   a - amount to be converted
-    //   from - source currency
-    //   to - target currency
+    // - a: amount to be converted.
+    // - from: source currency.
+    // - to: target currency.
     $url = "https://www.google.com/finance/converter?a=$amount&from=$from&to=$to";
 
     // Fetches widget HTML with converted amount.
diff --git a/src/Tests/GoogleCurrencyConverterBlockTest.php b/src/Tests/GoogleCurrencyConverterBlockTest.php
index 1fdf332..b335b10 100644
--- a/src/Tests/GoogleCurrencyConverterBlockTest.php
+++ b/src/Tests/GoogleCurrencyConverterBlockTest.php
@@ -45,7 +45,8 @@ class GoogleCurrencyConverterBlockTest extends WebTestBase {
     $theme_settings = $this->config('system.theme');
     foreach (['bartik', 'seven', 'stark'] as $theme) {
       $this->drupalGet('admin/structure/block/list/' . $theme);
-      $this->assertTitle(t('Block layout') . ' | Drupal');
+      $this->assertResponse(200);
+
       // Configure and save the block.
       $this->drupalPlaceBlock('google_currency_converter_block', array(
         'google_currency_converter_from' => 'AED',