diff --git a/test/module/webpage/functions.js b/test/module/webpage/functions.js
new file mode 100644
index 00000000..7dac67c0
--- /dev/null
+++ b/test/module/webpage/functions.js
@@ -0,0 +1,27 @@
+var assert = require('../../assert');
+var webpage = require('webpage');
+var page = webpage.create();
+
+assert.typeOf(page.canGoForward, 'boolean');
+assert.typeOf(page.canGoBack, 'boolean');
+assert.typeOf(page.clipRect, 'object');
+assert.typeOf(page.content, 'string');
+assert.typeOf(page.cookieJar, 'object');
+assert.typeOf(page.cookies, 'object');
+assert.typeOf(page.customHeaders, 'object');
+assert.typeOf(page.event, 'object');
+assert.typeOf(page.libraryPath, 'string');
+assert.typeOf(page.loading, 'boolean');
+assert.typeOf(page.loadingProgress, 'number');
+assert.typeOf(page.navigationLocked, 'boolean');
+assert.typeOf(page.offlineStoragePath, 'string');
+assert.typeOf(page.offlineStorageQuota, 'number');
+assert.typeOf(page.paperSize, 'object');
+assert.typeOf(page.plainText, 'string');
+assert.typeOf(page.scrollPosition, 'object');
+assert.typeOf(page.settings, 'object');
+assert.typeOf(page.title, 'string');
+assert.typeOf(page.url, 'string');
+assert.typeOf(page.viewportSize, 'object');
+assert.typeOf(page.windowName, 'string');
+assert.typeOf(page.zoomFactor, 'number');
diff --git a/test/module/webpage/properties.js b/test/module/webpage/properties.js
new file mode 100644
index 00000000..5f80436c
--- /dev/null
+++ b/test/module/webpage/properties.js
@@ -0,0 +1,33 @@
+var assert = require('../../assert');
+var webpage = require('webpage');
+var page = webpage.create();
+
+assert.typeOf(page.childFramesCount, 'function');
+assert.typeOf(page.childFramesName, 'function');
+assert.typeOf(page.close, 'function');
+assert.typeOf(page.currentFrameName, 'function');
+assert.typeOf(page.deleteLater, 'function');
+assert.typeOf(page.destroyed, 'function');
+assert.typeOf(page.evaluate, 'function');
+assert.typeOf(page.initialized, 'function');
+assert.typeOf(page.injectJs, 'function');
+assert.typeOf(page.javaScriptAlertSent, 'function');
+assert.typeOf(page.javaScriptConsoleMessageSent, 'function');
+assert.typeOf(page.loadFinished, 'function');
+assert.typeOf(page.loadStarted, 'function');
+assert.typeOf(page.openUrl, 'function');
+assert.typeOf(page.release, 'function');
+assert.typeOf(page.render, 'function');
+assert.typeOf(page.resourceError, 'function');
+assert.typeOf(page.resourceReceived, 'function');
+assert.typeOf(page.resourceRequested, 'function');
+assert.typeOf(page.uploadFile, 'function');
+assert.typeOf(page.sendEvent, 'function');
+assert.typeOf(page.setContent, 'function');
+assert.typeOf(page.switchToChildFrame, 'function');
+assert.typeOf(page.switchToMainFrame, 'function');
+assert.typeOf(page.switchToParentFrame, 'function');
+
+assert.typeOf(page.addCookie, 'function');
+assert.typeOf(page.deleteCookie, 'function');
+assert.typeOf(page.clearCookies, 'function');
diff --git a/test/webpage-spec.js b/test/webpage-spec.js
index de3f3b35..09a92cdd 100644
--- a/test/webpage-spec.js
+++ b/test/webpage-spec.js
@@ -1,5 +1,4 @@
 function checkClipRect(page, clipRect) {
-    expectHasProperty(page, 'clipRect');
     it("should have clipRect with height "+clipRect.height, function () {
         expect(page.clipRect.height).toEqual(clipRect.height);
     });
@@ -15,7 +14,6 @@ function checkClipRect(page, clipRect) {
 }
 
 function checkScrollPosition(page, scrollPosition) {
-    expectHasProperty(page, 'scrollPosition');
     it("should have scrollPosition with left "+scrollPosition.left, function () {
         expect(page.scrollPosition.left).toEqual(scrollPosition.left);
     });
@@ -25,7 +23,6 @@ function checkScrollPosition(page, scrollPosition) {
 }
 
 function checkViewportSize(page, viewportSize) {
-    expectHasProperty(page, 'viewportSize');
     it("should have viewportSize with height "+viewportSize.height, function () {
         expect(page.viewportSize.height).toEqual(viewportSize.height);
     });
@@ -159,69 +156,27 @@ describe("WebPage object", function() {
 
     checkClipRect(page, {height:0,left:0,top:0,width:0});
 
-    expectHasPropertyString(page, 'content');
-    expectHasPropertyString(page, 'plainText');
-
-    expectHasPropertyString(page, 'libraryPath');
-    expectHasPropertyString(page, 'offlineStoragePath');
-    expectHasProperty(page, 'offlineStorageQuota');
-
     it("should have objectName as 'WebPage'", function() {
         expect(page.objectName).toEqual('WebPage');
     });
 
-    expectHasProperty(page, 'paperSize');
     it("should have paperSize as an empty object", function() {
         expect(page.paperSize).toEqual({});
     });
 
     checkScrollPosition(page, {left:0,top:0});
 
-    expectHasProperty(page, 'settings');
     it("should have non-empty settings", function() {
         expect(page.settings).toNotEqual(null);
         expect(page.settings).toNotEqual({});
     });
 
-    expectHasProperty(page, 'zoomFactor');
     it("should have zoomFactor of 1", function() {
         expect(page.zoomFactor).toEqual(1.0);
     });
 
-    expectHasProperty(page, 'event');
-    expectHasProperty(page, 'cookies');
-
     checkViewportSize(page, {height:300,width:400});
 
-    expectHasFunction(page, 'deleteLater');
-    expectHasFunction(page, 'destroyed');
-    expectHasFunction(page, 'evaluate');
-    expectHasFunction(page, 'initialized');
-    expectHasFunction(page, 'injectJs');
-    expectHasFunction(page, 'javaScriptAlertSent');
-    expectHasFunction(page, 'javaScriptConsoleMessageSent');
-    expectHasFunction(page, 'loadFinished');
-    expectHasFunction(page, 'loadStarted');
-    expectHasFunction(page, 'openUrl');
-    expectHasFunction(page, 'release');
-    expectHasFunction(page, 'close');
-    expectHasFunction(page, 'render');
-    expectHasFunction(page, 'resourceReceived');
-    expectHasFunction(page, 'resourceRequested');
-    expectHasFunction(page, 'resourceError');
-    expectHasFunction(page, 'uploadFile');
-    expectHasFunction(page, 'sendEvent');
-    expectHasFunction(page, 'childFramesCount');
-    expectHasFunction(page, 'childFramesName');
-    expectHasFunction(page, 'switchToChildFrame');
-    expectHasFunction(page, 'switchToMainFrame');
-    expectHasFunction(page, 'switchToParentFrame');
-    expectHasFunction(page, 'currentFrameName');
-    expectHasFunction(page, 'addCookie');
-    expectHasFunction(page, 'deleteCookie');
-    expectHasFunction(page, 'clearCookies');
-    expectHasFunction(page, 'setContent');
-
     it("should set content and location", function() {
         runs(function() {
             var expectedContent = "<html><body><div>Test div</div></body></html>";