diff --git a/eck.bundle.inc b/eck.bundle.inc
index 4ec776d..275738b 100644
--- a/eck.bundle.inc
+++ b/eck.bundle.inc
@@ -394,7 +394,7 @@ function eck__bundle__delete_form_submit($form, &$form_state) {
 /**
  * Autocomplete functionality for entities using field labels.
  */
-function eck__bundle__field_autocomplete($entity_type, $bundle, $string = "") {
+function eck__bundle__field_autocomplete($entity_type, $bundle, $string = '') {
   $field_label = get_bundle_field_label_info($entity_type, $bundle);
   $matches = array();
 
@@ -425,10 +425,9 @@ function eck__bundle__field_autocomplete($entity_type, $bundle, $string = "") {
  * Helper function to determine if an entity wants to define a field as lable.
  */
 function get_bundle_field_label_info($entity_type, $bundle) {
-
   $info = entity_get_info();
 
-  if (array_key_exists('field label', $info[$entity_type->name]['bundles'][$bundle->name])) {
+  if (!empty($info[$entity_type->name]['bundles'][$bundle->name]['field label'])) {
     return $info[$entity_type->name]['bundles'][$bundle->name]['field label'];
   }
   else {
diff --git a/eck.classes.inc b/eck.classes.inc
index ed9df15..dee58e5 100644
--- a/eck.classes.inc
+++ b/eck.classes.inc
@@ -41,7 +41,7 @@ class DBObject implements Iterator {
       // Do we want to handle searialized variables by default? let's do it
       // and wait for some critizism.
       foreach ($schema['fields'] as $name => $field) {
-        if (array_key_exists('serialize', $field) && $field['serialize']) {
+        if (!empty($field['serialize'])) {
           $this->serialize[] = $name;
         }
       }
@@ -263,7 +263,7 @@ class EntityType extends DBObject {
    */
   public function removeProperty($name) {
     $p = $this->properties;
-    if (array_key_exists($name, $p)) {
+    if (!empty($p[$name])) {
 
       // Let the behaviors execute some code.
       eck_property_behavior_invoke_plugin($this, 'property_remove',
@@ -289,7 +289,7 @@ class EntityType extends DBObject {
   public function changeBehavior($name, $behavior) {
     $p = $this->properties;
     // @todo check that type is an actual type.
-    if (array_key_exists($name, $p)) {
+    if (!empty($p[$name])) {
       $p[$name]['behavior'] = $behavior;
       // @todo look at this more closelly, does the behavior change really
       // affect the property cache?
@@ -333,7 +333,7 @@ class EntityType extends DBObject {
         case 'remove':
           // If there is an add in the changes take it out, otherwise add a
           // remove.
-          if (array_key_exists('add', $c)) {
+          if (!empty($c['add'])) {
             $key = array_search($name, $c['add']);
             if ($key != FALSE) {
               unset($c['add'][$key]);
@@ -365,7 +365,7 @@ class EntityType extends DBObject {
     else {
       // Modify the already existing table in accordance with the
       // recorded changes.
-      if (array_key_exists('add', $this->changes)) {
+      if (!empty($this->changes['add'])) {
         foreach ($this->changes['add'] as $name) {
           // First lets get the record.
           $properties = $this->properties;
@@ -377,7 +377,7 @@ class EntityType extends DBObject {
           db_add_field("eck_{$this->name}", $name, $schema);
         }
       }
-      if (array_key_exists('remove', $this->changes)) {
+      if (!empty($this->changes['remove'])) {
         foreach ($this->changes['remove'] as $name) {
           db_drop_field("eck_{$this->name}", $name);
         }
@@ -484,7 +484,7 @@ class EntityType extends DBObject {
     if (!$entity_type_name) {
       return $entity_types;
     }
-    elseif (array_key_exists($entity_type_name, $entity_types)) {
+    elseif (!empty($entity_types[$entity_type_name])) {
       return $entity_types[$entity_type_name];
     }
     else {
@@ -662,7 +662,7 @@ class Bundle extends DBObject {
     if (!$machine_name) {
       return $bundles;
     }
-    elseif (array_key_exists($machine_name, $bundles)) {
+    elseif (!empty($bundles[$machine_name])) {
       return $bundles[$machine_name];
     }
     else {
@@ -761,7 +761,7 @@ class Bundle extends DBObject {
       'bundle' => $this->name,
     );
     // Merge any provided properties and settings.
-    if (array_key_exists('instance', $options)) {
+    if (!empty($options['instance'])) {
       $instance += $options['instance'];
     }
     return field_create_instance($instance);
diff --git a/eck.default_properties.inc b/eck.default_properties.inc
index 2ae0704..11c31ce 100644
--- a/eck.default_properties.inc
+++ b/eck.default_properties.inc
@@ -57,7 +57,7 @@ function eck__default_properties__form_submit($form, &$state, $entity_type) {
 /**
  * All default properties information.
  * @todo combine this and get_default_property().
- * 
+ *
  * @return array
  *   All of the default properties info.
  */
@@ -67,10 +67,10 @@ function eck_get_default_properties() {
 
 /**
  * Get a default property by name.
- * 
+ *
  * @param string $name
  *   Default property's name.
- * 
+ *
  * @return array
  *   The default property info.
  */
diff --git a/eck.entity.inc b/eck.entity.inc
index a297fec..4e19ddc 100644
--- a/eck.entity.inc
+++ b/eck.entity.inc
@@ -84,7 +84,7 @@ function eck__entity__menu($entity_type, $bundle) {
     $action_label = ucfirst($action);
     $args = array();
 
-    if (array_key_exists('entity_id', $info)) {
+    if (!empty($info'entity_id')) {
       $args[] = $info['entity_id'];
     }
 
@@ -351,7 +351,7 @@ function eck__entity__form($form, &$form_state, $entity) {
   $properties = array();
   $found_widget = FALSE;
   foreach ($property_info['properties'] as $pname => $pi) {
-    if (array_key_exists('widget', $pi)) {
+    if (!empty($pi['widget'])) {
       $widget_callback = $pi['widget'];
       $widget = $widget_callback($entity);
       $properties[$pname] = $widget_callback;
@@ -422,7 +422,7 @@ function eck__entity__form_submit($form, &$state) {
       $vars = array('data' => $form_value);
       $data = eck_property_behavior_invoke_plugin($entity_type, 'pre_set', $vars);
 
-      if (array_key_exists($property, $data)) {
+      if (!empty($data[$property])) {
         $form_value = $data[$property];
       }
 
@@ -503,7 +503,7 @@ function eck__entity__view($entity_type_name, $bundle_name, $id) {
  * Get the value for a property from a form's state.
  */
 function _eck_form_property_value($state, $property) {
-  if (array_key_exists($property, $state['values'])) {
+  if (!empty($state['values'][$property])) {
     return $state['values'][$property];
   }
   return NULL;
diff --git a/eck.info b/eck.info
index e6b8efa..76bb4d4 100644
--- a/eck.info
+++ b/eck.info
@@ -13,4 +13,4 @@ files[] = views/handlers/eck_views_handler_field_link_edit.inc
 files[] = views/handlers/eck_views_handler_field_link_delete.inc
 
 ; Inline entity form integration
-files[] = includes/eck.inline_entity_form.inc
\ No newline at end of file
+files[] = includes/eck.inline_entity_form.inc
diff --git a/eck.module b/eck.module
index e3fde5e..56eaca7 100644
--- a/eck.module
+++ b/eck.module
@@ -183,7 +183,7 @@ function eck_schema_alter(&$schema) {
       // entity_type key, and a schema key.
       $vars = eck_property_behavior_invoke_plugin_alter($entity_type, 'schema', $vars);
 
-      if (array_key_exists('schema', $vars) && isset($vars['schema'])) {
+      if (!empty('schema', $vars)) {
         $schema = array_merge($schema, $vars['schema']);
       }
     }
@@ -525,7 +525,7 @@ function eck_permission() {
 
   $perms_info = array(
     'eck administer' => 'Administer',
-    'eck add' => "Add",
+    'eck add' => 'Add',
     'eck edit' => 'Edit',
     'eck delete' => 'Delete',
     'eck list' => 'View List of',
@@ -884,7 +884,7 @@ function eck_clean_up() {
  * If there are entity types created, let's not let the user disable the module.
  */
 function eck_system_info_alter(&$info, $file, $type) {
-  if ($type == "module" && array_key_exists("name", $info) && $info['name'] == "Entity Construction Kit") {
+  if ($type == 'module' && isset($info['name']) && $info['name'] == 'Entity Construction Kit') {
     $entity_types = EntityType::loadAll();
     if (!empty($entity_types)) {
       $info['required'] = TRUE;
diff --git a/eck.properties.inc b/eck.properties.inc
index af3f330..f1c2c5a 100644
--- a/eck.properties.inc
+++ b/eck.properties.inc
@@ -173,7 +173,7 @@ function eck__properties__form($form, &$state, $entity_type_name) {
         'type' => $state['values']['property_type'],
       );
 
-      if (array_key_exists('property_behavior', $state['values'])) {
+      if (!empty($state['values']['property_behavior'])) {
         $new_properties[$state['values']['property_name']]['behavior'] = $state['values']['property_behavior'];
       }
     }
@@ -209,11 +209,11 @@ function eck__properties__form($form, &$state, $entity_type_name) {
         'type' => $property_info['type'],
       );
 
-      if (array_key_exists('behavior', $property_info)) {
+      if (!empty($property_info['behavior'])) {
         $options[$property_name]['behavior'] = $property_info['behavior'];
       }
       else {
-        $options[$property_name]['behavior'] = "";
+        $options[$property_name]['behavior'] = '';
       }
     }
   }
@@ -301,8 +301,7 @@ function eck__properties__form($form, &$state, $entity_type_name) {
  * Deactivate on save.
  */
 function eck_deactivate_on_save($element, &$state) {
-  if (array_key_exists('input', $state) && array_key_exists('op', $state['input']) &&
-    $state['input']['op'] == t('Save')) {
+  if (isset($state['input']['op']) && $state['input']['op'] == t('Save')) {
     isset($element['#element_validate']) ? $element['#element_validate'] = NULL : NULL;
     isset($element['#needs_validation']) ? $element['#needs_validation'] = NULL : NULL;
   }
@@ -345,7 +344,7 @@ function eck__properties__form_submit($form, &$state) {
     foreach ($state['values']['new_properties_table'] as $property => $active) {
       if ($active) {
         $info = $state['values']['new_properties'][$property];
-        if (array_key_exists('behavior', $info)) {
+        if (!empty($info['behavior'])) {
           $entity_type->addProperty($property, $info['label'], $info['type'], $info['behavior']);
         }
         else {
diff --git a/eck.property_behavior.inc b/eck.property_behavior.inc
index d3a7f61..e81804a 100644
--- a/eck.property_behavior.inc
+++ b/eck.property_behavior.inc
@@ -21,7 +21,7 @@ function eck_property_behavior_implements($entity_type, $property, $function_nam
   $info = $entity_type->properties[$property];
   $return = FALSE;
 
-  if (array_key_exists('behavior', $info) && !empty($info['behavior'])) {
+  if (!empty($info['behavior'])) {
     $behavior = $info['behavior'];
     $plugin = ctools_get_plugins('eck', 'property_behavior', $behavior);
     $function = ctools_plugin_get_function($plugin, $function_name);
@@ -45,7 +45,7 @@ function eck_property_behavior_invoke_plugin($entity_type, $function_name, $all
   foreach ($properties as $property => $info) {
     // If there is a behavior associated with this property we need to call the
     // appropiate hooks.
-    if (array_key_exists('behavior', $info) && !empty($info['behavior'])) {
+    if (!empty($info['behavior'])) {
       $behavior = $info['behavior'];
 
       $plugin = ctools_get_plugins('eck', 'property_behavior', $behavior);
@@ -53,7 +53,7 @@ function eck_property_behavior_invoke_plugin($entity_type, $function_name, $all
       $function = ctools_plugin_get_function($plugin, $function_name);
 
       if ($function) {
-        if (array_key_exists($property, $specific)) {
+        if (!empty($specific[$property])) {
           $return = $function($property, array_merge($all, $specific[$property]));
         }
         else {
@@ -91,7 +91,7 @@ function eck_property_behavior_invoke_plugin_alter($entity_type, $function_name,
   foreach ($properties as $property => $info) {
     // If there is a behavior associated with this property we need to call
     // the appropiate hooks.
-    if (array_key_exists('behavior', $info) && !empty($info['behavior'])) {
+    if (!empty($info['behavior'])) {
       $behavior = $info['behavior'];
 
       $plugin = ctools_get_plugins('eck', 'property_behavior', $behavior);
diff --git a/examples/eck_example.info b/examples/eck_example.info
index 55c5231..fbb148a 100644
--- a/examples/eck_example.info
+++ b/examples/eck_example.info
@@ -2,4 +2,4 @@ name = ECK Example
 description = A module demonstrating the kind of things that ECK can do from code
 package = ECK
 core = 7.x
-dependencies[] = eck
\ No newline at end of file
+dependencies[] = eck
diff --git a/modules/eck_entitycache/eck_entitycache.module b/modules/eck_entitycache/eck_entitycache.module
index e8eee97..7c9480b 100644
--- a/modules/eck_entitycache/eck_entitycache.module
+++ b/modules/eck_entitycache/eck_entitycache.module
@@ -9,7 +9,7 @@
  * Implements hook_entity_info_alter().
  */
 function eck_entitycache_entity_info_alter(&$info){
- 
+
   foreach(EntityType::loadAll() as $entity_type){
     // Enable Entity Cache for this entity.
     $info[$entity_type->name]['entity cache'] = TRUE;
diff --git a/plugins/property_behavior/author.inc b/plugins/property_behavior/author.inc
index c6eb781..82bf1e8 100644
--- a/plugins/property_behavior/author.inc
+++ b/plugins/property_behavior/author.inc
@@ -2,8 +2,8 @@
 /**
  * @file
  * Author Behavior.
- * 
- * Save the user id of the user when the entity is created. 
+ *
+ * Save the user id of the user when the entity is created.
  */
 
 $plugin = array(
diff --git a/plugins/property_behavior/changed.inc b/plugins/property_behavior/changed.inc
index 7802783..64a72ae 100644
--- a/plugins/property_behavior/changed.inc
+++ b/plugins/property_behavior/changed.inc
@@ -2,7 +2,7 @@
 /**
  * @file
  * Changed behavior.
- * 
+ *
  * Store the current time in the property every time it is updated.
  */
 
diff --git a/plugins/property_behavior/created.inc b/plugins/property_behavior/created.inc
index 2727f3c..2f4f8ac 100644
--- a/plugins/property_behavior/created.inc
+++ b/plugins/property_behavior/created.inc
@@ -1,8 +1,8 @@
-<?php 
+<?php
 /**
  * @file
  * Created behavior.
- * 
+ *
  * Save the current time when an entity is created.
  */
 
diff --git a/plugins/property_behavior/language.inc b/plugins/property_behavior/language.inc
index 4f86eae..9e6b600 100644
--- a/plugins/property_behavior/language.inc
+++ b/plugins/property_behavior/language.inc
@@ -1,7 +1,7 @@
 <?php
 /**
  * @file
- * Implementation of Language property behavior, which represents the language 
+ * Implementation of Language property behavior, which represents the language
  * of an entity.
  */
 
@@ -56,7 +56,7 @@ function eck_language_property_property_info($property, $vars) {
 
 /**
  * Language widget.
- * 
+ *
  * Select one of the enabled languages.
  */
 function eck_language_property_widget($property, $vars) {
@@ -124,7 +124,7 @@ function eck_language_property_views_data_alter($property, $vars) {
 
 /**
  * Setting multilingual options in bundle form.
- * 
+ *
  * @todo Why is the behavior setting things in the bundle form?
  */
 function eck_language_property_bundle_form($property, $vars) {
diff --git a/plugins/property_behavior/title.inc b/plugins/property_behavior/title.inc
index 1dd8376..543c15f 100644
--- a/plugins/property_behavior/title.inc
+++ b/plugins/property_behavior/title.inc
@@ -2,8 +2,8 @@
 /**
  * @file
  * The title behavior makes a property behave like a title.
- * 
- * 1) When then entity is view, we set the page title to be the 
+ *
+ * 1) When then entity is view, we set the page title to be the
  *    properties value.
  * 2) We set the property as the label of the entity.
  * 3) The property can be entered by the user with a text field.
@@ -68,12 +68,12 @@ function eck_title_property_entity_info($property, $var) {
 
 /**
  * Helper function that gets the title from an entity.
- * 
+ *
  * @param object $entity
  *   an entity object.
  * @param string $property
  *   the name of the property that contains the title.
- * 
+ *
  * @return string
  *   The title of the entity.
  */
diff --git a/tests/README.txt b/tests/README.txt
index 87b9b1c..eacebf9 100644
--- a/tests/README.txt
+++ b/tests/README.txt
@@ -4,7 +4,7 @@ Setting up your environment for testing
 
 With composer, setting up things is fairly easy.
 
-1) Download and install the composer manager module: 
+1) Download and install the composer manager module:
    https://drupal.org/project/composer_manager
 
 2) Run the drush command: "drush composer-manager install".
@@ -12,7 +12,7 @@ With composer, setting up things is fairly easy.
    "drush composer-manager update"
    This should set up all of your dependencies and all of the libraries necessary
    to run behat tests.
- 
+
 By default, composer_manager will place all of the libraries at /sites/all/vendor.
 Inside of the vendor directory there is a bin directory and inside of it we can
 find the behat executable.
@@ -25,10 +25,10 @@ same directory, and rename it behat.yml. Inside of the file there are 3 comments
 that let you know things that you might have to configure for the tests to run
 in your machine.
 
-After configuring everything, eck/tests/behat, simply execute 
+After configuring everything, eck/tests/behat, simply execute
 <path-to-vendor-directory>/bin/behat -v
 
-NOTES: 
+NOTES:
 ------
 When trying to get things to run in Ubuntu 13.10, I ran into a few problems
 with phpunit.
@@ -37,4 +37,4 @@ Following the instructions in these 2 articles (Given that you get the same
 errors I did), fixed the problem for me:
 
 http://stackoverflow.com/a/5939737
-http://stackoverflow.com/a/8079653
\ No newline at end of file
+http://stackoverflow.com/a/8079653
diff --git a/tests/behat/default.local.yml b/tests/behat/default.local.yml
index 7fc9029..999ac0e 100644
--- a/tests/behat/default.local.yml
+++ b/tests/behat/default.local.yml
@@ -14,8 +14,8 @@ default:
             CURLOPT_SSL_VERIFYHOST: false
             CURLOPT_CERTINFO: false
             CURLOPT_TIMEOUT: 120
-      # The base url for your local site. ex. http://my-site.local      
-      base_url: 
+      # The base url for your local site. ex. http://my-site.local
+      base_url:
       # show_cmd is OS specific, for Ubuntu use xdg-open
       show_cmd: "open %s"
       selenium2:
@@ -25,6 +25,6 @@ default:
       api_driver: "drupal"
       drupal:
         # This must be an absolute path.
-        drupal_root: 
+        drupal_root:
       drush:
         alias: "self"
diff --git a/tests/behat/features/CRUD.feature b/tests/behat/features/CRUD.feature
index 750981b..625c946 100644
--- a/tests/behat/features/CRUD.feature
+++ b/tests/behat/features/CRUD.feature
@@ -3,15 +3,15 @@ Feature: CRUD
   As a content architect
   I want to be able to create, update, read, and delete entity types, bundles and entities
   so my content will be as lean and specific as possible.
-  
+
   Background:
     Given I am logged in as a user with the "administrator" role
-  
+
   Scenario: The entity type management page is completely functional
     Given I visit "/admin/structure/entity-type"
     Then I should see the heading "Entity types"
     Then I should see the link "Add entity type"
- 
+
   @entity-type
   Scenario: I am able to create entity types
     Given I visit "/admin/structure/entity-type"
@@ -21,7 +21,7 @@ Feature: CRUD
     And I check "Title"
     And I press the "Save" button
     Then I should see the text "Entity type Test 12587 has been updated."
-    
+
     Given I visit "/admin/structure/entity-type"
     Then I should see the text "Test 12587"
 
@@ -33,10 +33,10 @@ Feature: CRUD
     And I fill in "Machine-readable name" with "bundle_19756"
     And I press the "Save" button
     Then I should see the text "the bundle_19756 for entity type test_12587 has been saved"
-    
+
     Given I visit "/admin/structure/entity-type/test_12587"
     Then I should see the text "Bundle 19756"
-  
+
   @entity
   Scenario: I am able to create and view entities
     Given I visit "/admin/structure/entity-type/test_12587/bundle_19756"
@@ -79,4 +79,4 @@ Feature: CRUD
     And I press the "Delete" button
     Then I should see the text "Entity type 'test_12587' has been deleted"
     And I should not see "Test 12587"
-    
+
diff --git a/tests/behat/features/Permissions.feature b/tests/behat/features/Permissions.feature
index bfbdf1c..a8b8536 100644
--- a/tests/behat/features/Permissions.feature
+++ b/tests/behat/features/Permissions.feature
@@ -23,7 +23,7 @@ Feature: Permissions
     And I press the "Save" button
     And I visit "admin/people/permissions"
 
-    Examples: 
+    Examples:
       | type_label | type      | bundle_label | bundle | entity_title   | link                                       | add_link  |
       | "Vehicle"  | "vehicle" | "Car"        | "car"  | "Toyota Prius" | "/admin/structure/entity-type/vehicle/car" | "Add Car" |
       | "Animal"   | "animal"  | "Dog"        | "dog"  | "Snoopy"       | "/admin/structure/entity-type/animal/dog"  | "Add Dog" |
@@ -39,7 +39,7 @@ Feature: Permissions
     And I click "Entity types"
     Then I should get a "200" HTTP response
 
-    Examples: 
+    Examples:
       | permissions                                                     |
       | "Use the administration pages and help,View Entity Type List"   |
       | "Use the administration pages and help,Administer Entity Types" |
@@ -54,7 +54,7 @@ Feature: Permissions
     And I click "Add entity type"
     Then I should get a "200" HTTP response
 
-    Examples: 
+    Examples:
       | permissions                                                                           |
       | "Use the administration pages and help,View Entity Type List,Add Entity Types"        |
       | "Use the administration pages and help,View Entity Type List,Administer Entity Types" |
@@ -69,7 +69,7 @@ Feature: Permissions
     And I click "delete" in the "Vehicle" row
     Then I should get a "200" HTTP response
 
-    Examples: 
+    Examples:
       | permissions                                                                           |
       | "Use the administration pages and help,View Entity Type List,Delete Entity Types"     |
       | "Use the administration pages and help,View Entity Type List,Administer Entity Types" |
@@ -90,7 +90,7 @@ Feature: Permissions
     When I click <type_label>
     Then I should get a "200" HTTP response
 
-    Examples: 
+    Examples:
       | type_label | permissions                                                                      |
       | "Vehicle"  | "Use the administration pages and help,View Entity Type List,View Bundle Lists"  |
       | "Animal"   | "Use the administration pages and help,View Entity Type List,View Bundle Lists"  |
@@ -107,7 +107,7 @@ Feature: Permissions
     When I click "Vehicle"
     Then I should get a "200" HTTP response
 
-    Examples: 
+    Examples:
       | permissions                                                                                |
       | "Use the administration pages and help,View Entity Type List,View List of Vehicle Bundles" |
       | "Use the administration pages and help,View Entity Type List,Administer Vehicle Bundles"   |
@@ -126,7 +126,7 @@ Feature: Permissions
     When I click "Add bundle"
     Then I should get a "200" HTTP response
 
-    Examples: 
+    Examples:
       | link                                   | permissions                            |
       | "/admin/structure/entity-type/vehicle" | "View Bundle Lists,Add Bundles"        |
       | "/admin/structure/entity-type/animal"  | "View Bundle Lists,Add Bundles"        |
@@ -143,7 +143,7 @@ Feature: Permissions
     And I visit "/admin/structure/entity-type/animal"
     Then I should not see the link "Add bundle"
 
-    Examples: 
+    Examples:
       | permissions                                    |
       | "View Bundle Lists,Add Vehicle Bundles"        |
       | "View Bundle Lists,Administer Vehicle Bundles" |
@@ -162,7 +162,7 @@ Feature: Permissions
     When I click "delete"
     Then I should get a "200" HTTP response
 
-    Examples: 
+    Examples:
       | link                                   | permissions                            |
       | "/admin/structure/entity-type/vehicle" | "View Bundle Lists,Delete Bundles"     |
       | "/admin/structure/entity-type/animal"  | "View Bundle Lists,Delete Bundles"     |
@@ -179,7 +179,7 @@ Feature: Permissions
     And I visit "/admin/structure/entity-type/animal"
     Then I should not see the link "delete"
 
-    Examples: 
+    Examples:
       | permissions                                    |
       | "View Bundle Lists,Delete Vehicle Bundles"     |
       | "View Bundle Lists,Administer Vehicle Bundles" |
@@ -200,7 +200,7 @@ Feature: Permissions
     When I click <link>
     Then I should get a "200" HTTP response
 
-    Examples: 
+    Examples:
       | path                                   | link  | permissions                             |
       | "/admin/structure/entity-type/vehicle" | "Car" | "View Bundle Lists,View Entity Lists"   |
       | "/admin/structure/entity-type/animal"  | "Dog" | "View Bundle Lists,View Entity Lists"   |
@@ -218,7 +218,7 @@ Feature: Permissions
     Then I should not see the link "Dog"
     But I should see the text "Dog"
 
-    Examples: 
+    Examples:
       | permissions                                           |
       | "View Bundle Lists,View List of Vehicle Car Entities" |
       | "View Bundle Lists,Administer Vehicle Car Entities"   |
@@ -237,7 +237,7 @@ Feature: Permissions
     When I click <link>
     Then I should get a "200" HTTP response
 
-    Examples: 
+    Examples:
       | path                                       | link      | permissions                             |
       | "/admin/structure/entity-type/vehicle/car" | "Add Car" | "View Entity Lists,Add Entities"        |
       | "/admin/structure/entity-type/animal/dog"  | "Add Dog" | "View Entity Lists,Add Entities"        |
@@ -254,7 +254,7 @@ Feature: Permissions
     And I visit "/admin/structure/entity-type/animal/dog"
     Then I should not see the link "Add Dog"
 
-    Examples: 
+    Examples:
       | permissions                                         |
       | "View Entity Lists,Add Vehicle Car Entities"        |
       | "View Entity Lists,Administer Vehicle Car Entities" |
@@ -273,7 +273,7 @@ Feature: Permissions
     When I click <link>
     Then I should get a "200" HTTP response
 
-    Examples: 
+    Examples:
       | path                                       | link           | permissions                             |
       | "/admin/structure/entity-type/vehicle/car" | "Toyota Prius" | "View Entity Lists,View Any Entity"     |
       | "/admin/structure/entity-type/animal/dog"  | "Snoopy"       | "View Entity Lists,View Any Entity"     |
@@ -290,7 +290,7 @@ Feature: Permissions
     And I visit "/admin/structure/entity-type/animal/dog"
     Then I should not see the link "Snoopy"
 
-    Examples: 
+    Examples:
       | permissions                                         |
       | "View Entity Lists,View Vehicle Car Entities"       |
       | "View Entity Lists,Administer Vehicle Car Entities" |
@@ -309,7 +309,7 @@ Feature: Permissions
     When I click "edit"
     Then I should get a "200" HTTP response
 
-    Examples: 
+    Examples:
       | path                                       | permissions                             |
       | "/admin/structure/entity-type/vehicle/car" | "View Entity Lists,Edit Any Entity"     |
       | "/admin/structure/entity-type/animal/dog"  | "View Entity Lists,Edit Any Entity"     |
@@ -326,7 +326,7 @@ Feature: Permissions
     And I visit "/admin/structure/entity-type/animal/dog"
     Then I should not see the link "edit"
 
-    Examples: 
+    Examples:
       | permissions                                         |
       | "View Entity Lists,Edit Vehicle Car Entities"       |
       | "View Entity Lists,Administer Vehicle Car Entities" |
@@ -345,7 +345,7 @@ Feature: Permissions
     When I click "delete"
     Then I should get a "200" HTTP response
 
-    Examples: 
+    Examples:
       | path                                       | permissions                             |
       | "/admin/structure/entity-type/vehicle/car" | "View Entity Lists,Delete Any Entity"   |
       | "/admin/structure/entity-type/animal/dog"  | "View Entity Lists,Delete Any Entity"   |
@@ -362,7 +362,7 @@ Feature: Permissions
     And I visit "/admin/structure/entity-type/animal/dog"
     Then I should not see the link "delete"
 
-    Examples: 
+    Examples:
       | permissions                                         |
       | "View Entity Lists,Delete Vehicle Car Entities"     |
       | "View Entity Lists,Administer Vehicle Car Entities" |
@@ -375,7 +375,7 @@ Feature: Permissions
     And I click "Delete"
     And I press the "Delete" button
 
-    Examples: 
+    Examples:
       | type_label |
       | "Vehicle"  |
       | "Animal"   |
diff --git a/tests/behat/features/Properties.feature b/tests/behat/features/Properties.feature
index 60d6ae1..69f2221 100644
--- a/tests/behat/features/Properties.feature
+++ b/tests/behat/features/Properties.feature
@@ -4,7 +4,7 @@ Feature: CRUD
   I want to be able to forge my entities with custom attributes (properties)
   so my content will do exactly what it needs to do
 
-  Background: 
+  Background:
     Given I am logged in as a user with the "administrator" role
 
   @setup
@@ -26,7 +26,7 @@ Feature: CRUD
     And I press the "edit-property-add" button
     And I check the box <checkbox>
     And I press the "Save" button
-    
+
     Given I visit "admin/structure/entity-type/vehicle/car/add"
     And I fill in <label> with <value>
     And I press the "Save" button
@@ -36,7 +36,7 @@ Feature: CRUD
     And I uncheck the box <checkbox>
     And I press the "Save" button
 
-    Examples: 
+    Examples:
       | type               | label | name | checkbox                   | value          |
       | "text"             | "T"   | "t"  | "new_properties_table[t]"  | "Toyota Prius" |
       | "integer"          | "I"   | "i"  | "new_properties_table[i]"  | "-123456"      |
diff --git a/tests/behat/features/bootstrap/FeatureContext.php b/tests/behat/features/bootstrap/FeatureContext.php
index 2a19ca1..fdb890a 100644
--- a/tests/behat/features/bootstrap/FeatureContext.php
+++ b/tests/behat/features/bootstrap/FeatureContext.php
@@ -17,10 +17,10 @@ use Behat\Gherkin\Node\PyStringNode,
 class FeatureContext extends Drupal\DrupalExtension\Context\DrupalContext {
   /**
    * Initializes context.
-   * 
+   *
    * Every scenario gets its own context object.
    *
-   * @param array $parameters 
+   * @param array $parameters
    *   Context parameters (set them up through behat.yml)
    */
   public function __construct(array $parameters) {}