5 files changed, 42 insertions, 10 deletions
diff --git a/lib/helpers.js b/lib/helpers.js
index 6a86eb37..ccfaf561 100644
--- a/lib/helpers.js
+++ b/lib/helpers.js
@@ -34,10 +34,6 @@ exports.shuffle = function (o) {
     return o;
 };
 
-exports.generateDataSet = function (size) {
-    return undefined;
-};
-
 exports.createCard = function () {
     return {
         "name": Faker.Name.findName(),
diff --git a/lib/phone_number.js b/lib/phone_number.js
index 8f884419..71fc934c 100644
--- a/lib/phone_number.js
+++ b/lib/phone_number.js
@@ -1,10 +1,16 @@
+var Faker = require('../index');
 var Helpers = require('./helpers');
 var definitions = require('./definitions');
 
-exports.phoneNumber = function () {
-    return Helpers.replaceSymbolWithNumber(Helpers.randomize(definitions.phone_formats()));
-};
+var phone = {
+    phoneNumber: function () {
+        return Helpers.replaceSymbolWithNumber(Faker.random.phone_formats());
+    },
 
-exports.phoneNumberFormat = function (format) {
-    return Helpers.replaceSymbolWithNumber(definitions.phone_formats()[format]);
+    // FIXME: this is strange passing in an array index.
+    phoneNumberFormat: function (phoneFormatsArrayIndex) {
+        return Helpers.replaceSymbolWithNumber(definitions.phone_formats()[phoneFormatsArrayIndex]);
+    }
 };
+
+module.exports = phone;
diff --git a/lib/random.js b/lib/random.js
index 5717a20a..89dbd1fd 100644
--- a/lib/random.js
+++ b/lib/random.js
@@ -86,6 +86,10 @@ var random = {
 
     bs_noun: function () {
         return this.array_rand(definitions.bs_noun());
+    },
+
+    phone_formats: function () {
+        return this.array_rand(definitions.phone_formats());
     }
 };
 
diff --git a/test/name.unit.js b/test/name.unit.js
index dd5fe14f..ae81a289 100644
--- a/test/name.unit.js
+++ b/test/name.unit.js
@@ -1,7 +1,6 @@
 var assert = require('assert');
 var sinon = require('sinon');
 var Faker = require('../index');
-var random = require('../lib/random');
 
 describe("name.js", function () {
     describe("firstName()", function () {
diff --git a/test/phone_number.unit.js b/test/phone_number.unit.js
new file mode 100644
index 00000000..983346de
--- /dev/null
+++ b/test/phone_number.unit.js
@@ -0,0 +1,27 @@
+var assert = require('assert');
+var sinon = require('sinon');
+var Faker = require('../index');
+
+describe("phone_number.js", function () {
+    describe("phoneNumber()", function () {
+        it("returns a random phoneNumber with a random format", function () {
+            sinon.spy(Faker.random, 'phone_formats');
+            sinon.spy(Faker.Helpers, 'replaceSymbolWithNumber');
+            var phone_number = Faker.PhoneNumber.phoneNumber();
+
+            assert.ok(phone_number.match(/\d/));
+            assert.ok(Faker.random.phone_formats.called);
+            assert.ok(Faker.Helpers.replaceSymbolWithNumber.called);
+
+            Faker.random.phone_formats.restore();
+            Faker.Helpers.replaceSymbolWithNumber.restore();
+        });
+    });
+
+    describe("phoneNumberFormat()", function () {
+        it("returns phone number with requested format (Array index)", function () {
+            var phone_number = Faker.PhoneNumber.phoneNumberFormat(5);
+            assert.ok(phone_number.match(/\(\d\d\d\)\d\d\d-\d\d\d\d/));
+        });
+    });
+});