diff --git a/fizzBuzz.js b/fizzBuzz.js
index 7734fe7..1bcbb66 100644
--- a/fizzBuzz.js
+++ b/fizzBuzz.js
@@ -1,4 +1,16 @@
 function fizzBuzz(number) {
+    if (number % 3 === 0 && number % 5 === 0) {
+        return "FizzBuzz";
+    }
+    else if (number % 3 === 0) {
+        return "Fizz";
+    }
+    else if (number % 5 === 0) {
+        return "Buzz";
+    }
+    else {
+        return number;
+    }
 }
 
 module.exports = fizzBuzz;
diff --git a/fizzBuzzTest.js b/fizzBuzzTest.js
index b62cb51..f1cea9e 100644
--- a/fizzBuzzTest.js
+++ b/fizzBuzzTest.js
@@ -11,7 +11,7 @@ describe("FizzBuzz", function() {
     assert.equal(actual, expected);
   });
 
-  xit("can convert multiples of 3 to Fizz", function() {
+  it("can convert multiples of 3 to Fizz", function() {
     //Arrange
     var expected = "Fizz";
     //Act
@@ -20,7 +20,7 @@ describe("FizzBuzz", function() {
     assert.equal(actual, expected);
   });
 
-  xit("can convert multiples of 5 to Buzz", function() {
+ it("can convert multiples of 5 to Buzz", function() {
     //Arrange
     var expected = "Buzz";
     //Act
@@ -29,7 +29,7 @@ describe("FizzBuzz", function() {
     assert.equal(actual, expected);
   });
 
-  xit("can convert multiples of 3 and 5 to FizzBuzz", function() {
+  it("can convert multiples of 3 and 5 to FizzBuzz", function() {
     //Arrange
     var expected = "FizzBuzz";
     //Act