diff --git a/fizz_buzz.py b/fizz_buzz.py
new file mode 100644
index 0000000..a071f74
--- /dev/null
+++ b/fizz_buzz.py
@@ -0,0 +1,8 @@
+def get_fizz_buzz(n):
+    if n % 15 == 0:
+        return "FizzBuzz"
+    if n % 3 == 0:
+        return "Fizz"
+    if n % 5 == 0:
+        return "Buzz"
+    return n
diff --git a/helloworld.py b/helloworld.py
old mode 100644
new mode 100755
diff --git a/helloworld_test.py b/helloworld_test.py
old mode 100644
new mode 100755
diff --git a/test_module.py b/test_module.py
new file mode 100644
index 0000000..386356d
--- /dev/null
+++ b/test_module.py
@@ -0,0 +1,18 @@
+import unittest
+import fizz_buzz
+
+fb = dict()
+fb[1] = 1
+fb[3] = "Fizz"
+fb[5] = "Buzz"
+fb[15] = "FizzBuzz"
+
+
+class TestFizzBuzz(unittest.TestCase):
+    def test_case(self):
+        for k, v in fb.items():
+            self.assertEqual(v, fizz_buzz.get_fizz_buzz(k))
+
+
+if __name__ == '__main__':
+    unittest.main()