diff --git a/index.js b/index.js
index 71e5618..da9f797 100644
--- a/index.js
+++ b/index.js
@@ -35,7 +35,7 @@ module.exports = (options = {}) => {
 
   // Forward webhooks to robot
   webhook.on('*', event => {
-    this.log.trace(event, 'webhook received');
+    logger.trace(event, 'webhook received');
     robot.receive(event);
   });
 
@@ -58,6 +58,7 @@ module.exports = (options = {}) => {
   return {
     server,
     robot,
+    webhook,
 
     start() {
       server.listen(options.port);
diff --git a/test/index.js b/test/index.js
index e69de29..46c6979 100644
--- a/test/index.js
+++ b/test/index.js
@@ -0,0 +1,26 @@
+const expect = require('expect');
+const createProbot = require('..');
+
+describe('Probot', () => {
+  let probot;
+  let event;
+
+  beforeEach(() => {
+    probot = createProbot();
+    // Mock out GitHub App authentication
+    probot.robot.auth = () => Promise.resolve({});
+
+    event = {
+      event: 'push',
+      payload: require('./fixtures/webhook/push')
+    };
+  });
+
+  describe('webhook delivery', () => {
+    it('forwards webhooks to the robot', async () => {
+      probot.robot.receive = expect.createSpy();
+      probot.webhook.emit('*', event);
+      expect(probot.robot.receive).toHaveBeenCalledWith(event);
+    });
+  });
+});
diff --git a/test/robot.js b/test/robot.js
index 57a0c77..c2958bf 100644
--- a/test/robot.js
+++ b/test/robot.js
@@ -113,7 +113,6 @@ describe('Robot', function () {
     });
   });
 
-
   describe('error handling', () => {
     it('logs errors throw from handlers', async () => {
       const error = new Error('testing');