diff --git a/calculator.py b/calculator.py
index f683f95..c34e00c 100644
--- a/calculator.py
+++ b/calculator.py
@@ -15,7 +15,9 @@ def multiply(num1, num2):
  
 # Function to divide two numbers
 def divide(num1, num2):
-    return num1 / num2
+    if num2 != 0:
+        return num1 / num2
+    else: raise ZeroDivisionError
 
 def run_calc(): 
     print("Please select operation -\n" \
diff --git a/test.py b/test.py
index 221e29f..a5e0845 100644
--- a/test.py
+++ b/test.py
@@ -2,8 +2,21 @@
 
 # import pytest
 
-from calculator import add
+from calculator import *
 
 def test_add():
     assert add(2, 2) == 4
 
+def test_subtract():
+    assert subtract(5,3) == 2
+
+def test_multiply():
+    assert multiply(3,4) == 12
+    
+def test_divide():
+    assert divide(6,2) == 3
+    try:
+        divide(6,0)
+        assert False
+    except ZeroDivisionError:
+        assert True
\ No newline at end of file