diff --git a/challenge.py b/challenge.py
index ffdfcce..9bc18e4 100644
--- a/challenge.py
+++ b/challenge.py
@@ -3,52 +3,37 @@
 
 def square_area(side):
     """Returns the area of a square"""
-    # You have to code here
-    # REMEMBER: Tests first!!!
-    pass
+    return side*side
 
 
 def rectangle_area(base, height):
     """Returns the area of a rectangle"""
-    # You have to code here
-    # REMEMBER: Tests first!!!
-    pass
+    return base * height
 
 
 def triangle_area(base, height):
     """Returns the area of a triangle"""
-    # You have to code here
-    # REMEMBER: Tests first!!!
-    pass
+    return (base*height)/2
 
 
 def rhombus_area(diagonal_1, diagonal_2):
     """Returns the area of a rhombus"""
-    # You have to code here
-    # REMEMBER: Tests first!!!
-    pass
+    return (diagonal_1*diagonal_2)/2
 
 
 def trapezoid_area(base_minor, base_major, height):
     """Returns the area of a trapezoid"""
-    # You have to code here
-    # REMEMBER: Tests first!!!
-    pass
+    return height*((base_minor + base_major)/2)
 
 
 def regular_polygon_area(perimeter, apothem):
     """Returns the area of a regular polygon"""
-    # You have to code here
-    # REMEMBER: Tests first!!!
-    pass
+    return (perimeter * apothem) / 2
 
 
 def circumference_area(radius):
     """Returns the area of a circumference"""
-    # You have to code here
-    # REMEMBER: Tests first!!!
-    # Use math.pi for π value
-    pass
+    return math.pi * math.pow(radius, 2)
 
 
 if __name__ == '__main__':
@@ -57,32 +42,46 @@ def circumference_area(radius):
     class GeometrySuite(unittest.TestCase):
 
         def setUp(self):
-            # Initialize the needed values for the tests
-            pass
+            self.areas = {
+                'square': [25, 5],
+                'rectangle': [30, 5, 6],
+                'triangle': [4, 2, 4],
+                'rhombus': [7.5, 5, 3],
+                'trapezoid': [20, 7, 3, 4],
+                'polygon': [10.5, 7, 3],
+                'circunference': [12.57, 2]
+            }
 
         def test_square_area(self):
-            # Make this test first...
+            self.assertEqual(self.areas['square'][0],
+                             square_area(self.areas['square'][1]))
 
         def test_rectangle_area(self):
-            # Make this test first...
+            self.assertEqual(self.areas['rectangle'][0], rectangle_area(
+                self.areas['rectangle'][1], self.areas['rectangle'][2]))
 
         def test_triangle_area(self):
-            # Make this test first...
+            self.assertEqual(self.areas['triangle'][0], triangle_area(
+                self.areas['triangle'][1], self.areas['triangle'][2]))
 
         def test_rhombus_area(self):
-            # Make this test first...
+            self.assertEqual(self.areas['rhombus'][0], rhombus_area(
+                self.areas['rhombus'][1], self.areas['rhombus'][2]))
 
         def test_trapezoid_area(self):
-            # Make this test first...
+            self.assertEqual(self.areas['trapezoid'][0], trapezoid_area(
+                self.areas['trapezoid'][1], self.areas['trapezoid'][2], self.areas['trapezoid'][3]))
 
         def test_regular_polygon_area(self):
-            # Make this test first...
+            self.assertEqual(self.areas['polygon']
+                             [0], regular_polygon_area(self.areas['polygon'][1], self.areas['polygon'][2]))
 
         def test_circumference_area(self):
-            # Make this test first...
+            self.assertEqual(self.areas['circunference'][0], round(circumference_area(
+                self.areas['circunference'][1]), 2))
 
         def tearDown(self):
-            # Delete the needed values for the tests
+            del(self.areas)
             pass
 
     unittest.main()