diff --git a/docs/en/README.md b/docs/en/README.md
index 4a3bc81c5..586453c27 100644
--- a/docs/en/README.md
+++ b/docs/en/README.md
@@ -26,7 +26,10 @@
     - [attrs](api/options.md#attrs)
     - [listeners](api/options.md#listeners)
     - [clone](api/options.md#clone)
+    - [provide](api/options.md#provide)
   * [Wrapper](api/wrapper/README.md)
+    * [attributes](api/wrapper/attributes.md)
+    * [classes](api/wrapper/classes.md)
     * [contains](api/wrapper/contains.md)
     * [emitted](api/wrapper/emitted.md)
     * [emittedByOrder](api/wrapper/emittedByOrder.md)
@@ -34,15 +37,13 @@
     * [destroy](api/wrapper/destroy.md)
     * [find](api/wrapper/find.md)
     * [findAll](api/wrapper/findAll.md)
-    * [hasAttribute](api/wrapper/hasAttribute.md)
-    * [hasClass](api/wrapper/hasClass.md)
-    * [hasProp](api/wrapper/hasProp.md)
     * [hasStyle](api/wrapper/hasStyle.md)
     * [html](api/wrapper/html.md)
     * [is](api/wrapper/is.md)
     * [isEmpty](api/wrapper/isEmpty.md)
     * [isVueInstance](api/wrapper/isVueInstance.md)
     * [name](api/wrapper/name.md)
+    * [props](api/wrapper/props.md)
     * [setComputed](api/wrapper/setComputed.md)
     * [setData](api/wrapper/setData.md)
     * [setMethods](api/wrapper/setMethods.md)
@@ -55,9 +56,6 @@
     * [contains](api/wrapper-array/contains.md)
     * [exists](api/wrapper/exists.md)
     * [destroy](api/wrapper-array/destroy.md)
-    * [hasAttribute](api/wrapper-array/hasAttribute.md)
-    * [hasClass](api/wrapper-array/hasClass.md)
-    * [hasProp](api/wrapper-array/hasProp.md)
     * [hasStyle](api/wrapper-array/hasStyle.md)
     * [is](api/wrapper-array/is.md)
     * [isEmpty](api/wrapper-array/isEmpty.md)
diff --git a/docs/en/SUMMARY.md b/docs/en/SUMMARY.md
index 3f046fa48..89aedfafa 100644
--- a/docs/en/SUMMARY.md
+++ b/docs/en/SUMMARY.md
@@ -22,6 +22,7 @@
     - [attrs](api/options.md#attrs)
     - [listeners](api/options.md#listeners)
     - [clone](api/options.md#clone)
+    - [provide](api/options.md#provide)
   * [Wrapper](api/wrapper/README.md)
     * [attributes](api/wrapper/attributes.md)
     * [classes](api/wrapper/classes.md)
diff --git a/docs/en/api/README.md b/docs/en/api/README.md
index 28993ec27..3a2bdc783 100644
--- a/docs/en/api/README.md
+++ b/docs/en/api/README.md
@@ -12,7 +12,10 @@
   - [attrs](./options.md#attrs)
   - [listeners](./options.md#listeners)
   - [clone](./options.md#clone)
+  - [provide](./options.md#provide)
 * [Wrapper](./wrapper/README.md)
+  * [attributes](./wrapper/attributes.md)
+  * [classes](./wrapper/classes.md)
   * [contains](./wrapper/contains.md)
   * [emitted](./wrapper/emitted.md)
   * [emittedByOrder](./wrapper/emittedByOrder.md)
@@ -29,6 +32,7 @@
   * [isEmpty](./wrapper/isEmpty.md)
   * [isVueInstance](./wrapper/isVueInstance.md)
   * [name](./wrapper/name.md)
+  * [props](./wrapper/props.md)
   * [setComputed](./wrapper/setComputed.md)
   * [setData](./wrapper/setData.md)
   * [setMethods](./wrapper/setMethods.md)
@@ -41,9 +45,6 @@
   * [contains](./wrapper-array/contains.md)
   * [exists](./wrapper/exists.md)
   * [destroy](./wrapper-array/destroy.md)
-  * [hasAttribute](./wrapper-array/hasAttribute.md)
-  * [hasClass](./wrapper-array/hasClass.md)
-  * [hasProp](./wrapper-array/hasProp.md)
   * [hasStyle](./wrapper-array/hasStyle.md)
   * [is](./wrapper-array/is.md)
   * [isEmpty](./wrapper-array/isEmpty.md)
diff --git a/docs/en/api/options.md b/docs/en/api/options.md
index 88c41b2be..4d83e572e 100644
--- a/docs/en/api/options.md
+++ b/docs/en/api/options.md
@@ -13,9 +13,9 @@ Vue options are passed to the component when a new instance is created. , e.g. `
 - [`localVue`](#localvue)
 - [`attachToDocument`](#attachtodocument)
 - [`attrs`](#attrs)
-- [`provide`](#provide)
 - [`listeners`](#listeners)
 - [`clone`](#clone)
+- [`provide`](#provide)
 
 ### `context`
 
diff --git a/docs/en/guides/dom-events.md b/docs/en/guides/dom-events.md
index bf92955be..17b4a98e4 100644
--- a/docs/en/guides/dom-events.md
+++ b/docs/en/guides/dom-events.md
@@ -189,7 +189,23 @@ describe('Key event tests', () => {
 
 A key name after the dot `keydown.up` is translated to a `keyCode`. This is supported for the following names:
 
-* `enter`, `tab`, `delete`, `esc`, `space`, `up`, `down`, `left`, `right`
+| key name | key code |
+| --- | --- |
+| enter | 13 |
+| esc | 27 |
+| tab | 9 |
+| space | 32 |
+| delete | 46 |
+| backspace | 8 |
+| insert | 45 |
+| up | 38 |
+| down | 40 |
+| left | 37 |
+| right | 39 |
+| end | 35 |
+| home | 36 |
+| pageup | 33 |
+| pagedown | 34 |
 
 ## Important
 
diff --git a/src/lib/find-vue-components.js b/src/lib/find-vue-components.js
index 381a3e7d5..dd74fbc5d 100644
--- a/src/lib/find-vue-components.js
+++ b/src/lib/find-vue-components.js
@@ -10,7 +10,6 @@ function findAllVueComponentsFromVm (vm: Component, components: Array<Component>
 }
 
 function findAllVueComponentsFromVnode (vnode: Component, components: Array<Component> = []): Array<Component> {
-  debugger
   if (vnode.child) {
     components.push(vnode.child)
   }
@@ -30,7 +29,6 @@ export function vmCtorMatchesName (vm: Component, name: string): boolean {
 }
 
 export default function findVueComponents (root: Component, componentName: string): Array<Component> {
-  debugger
   const components = root._isVue ? findAllVueComponentsFromVm(root) : findAllVueComponentsFromVnode(root)
   return components.filter((component) => {
     if (!component.$vnode) {
diff --git a/test/resources/components/component-with-events.vue b/test/resources/components/component-with-events.vue
index 2883af0d8..eb09dc42a 100644
--- a/test/resources/components/component-with-events.vue
+++ b/test/resources/components/component-with-events.vue
@@ -3,7 +3,7 @@
     <button class="click" @click="clickHandler" id="button" />
     <button class="left-click" @mousedown="mousedownHandler" />
     <div @click="toggleActive" v-bind:class="{ toggle: true, active: isActive }" />
-    <input class="keydown" type="text" @keydown="keydownHandler" />
+    <input class="keydown" type="text" @keyup="keyupHandler" @keydown="keydownHandler" />
     <input class="keydown-enter" type="text" @keydown.enter="keydownHandler" />
   </div>
 </template>
@@ -16,6 +16,10 @@
         type: Function,
         default: () => {}
       },
+      keyupHandler: {
+        type: Function,
+        default: () => {}
+      },
       keydownHandler: {
         type: Function,
         default: () => {}
diff --git a/test/unit/specs/mount/Wrapper/trigger.spec.js b/test/unit/specs/mount/Wrapper/trigger.spec.js
index c13f8aa7b..7ae6db1b2 100644
--- a/test/unit/specs/mount/Wrapper/trigger.spec.js
+++ b/test/unit/specs/mount/Wrapper/trigger.spec.js
@@ -43,6 +43,35 @@ describe('trigger', () => {
     expect(keydownHandler.calledOnce).to.equal(true)
   })
 
+  it('convert a registered key name to a key code', () => {
+    const modifiers = {
+      enter: 13,
+      esc: 27,
+      tab: 9,
+      space: 32,
+      delete: 46,
+      backspace: 8,
+      insert: 45,
+      up: 38,
+      down: 40,
+      left: 37,
+      right: 39,
+      end: 35,
+      home: 36,
+      pageup: 33,
+      pagedown: 34
+    }
+    const keyupHandler = sinon.stub()
+    const wrapper = mount(ComponentWithEvents, {
+      propsData: { keyupHandler }
+    })
+    for (const keyName in modifiers) {
+      const keyCode = modifiers[keyName]
+      wrapper.find('.keydown').trigger(`keyup.${keyName}`)
+      expect(keyupHandler.lastCall.args[0].keyCode).to.equal(keyCode)
+    }
+  })
+
   it('causes DOM to update after clickHandler method that changes components data is called', () => {
     const wrapper = mount(ComponentWithEvents)
     const toggle = wrapper.find('.toggle')