diff --git a/tests/test_currencyExchange.c b/tests/test_currencyExchange.c
index 13aef17..821f56a 100644
--- a/tests/test_currencyExchange.c
+++ b/tests/test_currencyExchange.c
@@ -11,64 +11,12 @@ void tearDown(void)
 {
 }
 
-//void test_toUSD(void) {
-//
-//    /* Arrange */
-//
-//    int length   = 5;
-//    float euro[] = {34, 233, 400, 100, 45};
-//    
-//    float expectedUSD[length];
-//    float resultUSD[length];
-//
-//    for (int i = 0; i < length; i++) {
-//        resultUSD[i] = toUSD(euro[i]);
-//    }
-//
-//    /* Act */
-//
-//    for (int i = 0; i < length; i++) {
-//        expectedUSD[i] = euro[i] * CURRENT_USD_RATE_OF_ONE_EURO;
-//    }
-//
-//    /* Assert */
-//
-//    for (int i = 0; i < length; i++) {
-//        TEST_ASSERT_EQUAL_FLOAT(expectedUSD[i], resultUSD[i]);
-//    }
-//
-//}
-//
-//void test_toGBP(void) {
-//
-//    /* Arrange */
-//
-//    int length   = 5;
-//    float euro[] = {34, 233, 400, 100, 45};
-//    
-//    float expectedGBP[length];
-//    float resultGBP[length];
-//
-//    for (int i = 0; i < length; i++) {
-//        resultGBP[i] = toGBP(euro[i]);
-//    }
-//
-//    /* Act */
-//
-//    for (int i = 0; i < length; i++) {
-//        expectedGBP[i] = euro[i] * CURRENT_GBP_RATE_OF_ONE_EURO;
-//    }
-//
-//    /* Assert */
-//
-//    for (int i = 0; i < length; i++) {
-//        TEST_ASSERT_EQUAL_FLOAT(expectedGBP[i], resultGBP[i]);
-//    }
-//
-//}
 void test_convert(void) {
-    int length   = 5;
-    float euro[] = {34, 233, 400, 100, 45};
+
+    /* Arrange */
+
+    int length   = 10;
+    float euro[] = {34, 233, 400, 100, 45, 344, 767.32, 122, 435, 899};
     
     float expectedUSD[length];
     float expectedGBP[length];
@@ -77,15 +25,19 @@ void test_convert(void) {
     float resultGBP[length];
 
     for (int i = 0; i < length; i++) {
-        expectedUSD[i] = euro[i] * CURRENT_USD_RATE_OF_ONE_EURO;
-        expectedGBP[i] = euro[i] * CURRENT_GBP_RATE_OF_ONE_EURO;
+        expectedUSD[i] = euro[i] * USD_RATE_OF_ONE_EURO;
+        expectedGBP[i] = euro[i] * GBP_RATE_OF_ONE_EURO;
     }
 
+    /* Act */
+
     for (int i = 0; i < length; i++) {
-        resultUSD[i] = convert(euro[i], 1);
-        resultGBP[i] = convert(euro[i], 2);
+        resultUSD[i] = convert(euro[i], CURRENCY_CODE_USD);
+        resultGBP[i] = convert(euro[i], CURRENCY_CODE_GBP);
     }
 
+    /* Assert*/
+
     for (int i = 0; i < length; i++) {
         TEST_ASSERT_EQUAL_FLOAT(expectedUSD[i], resultUSD[i]);
         TEST_ASSERT_EQUAL_FLOAT(expectedGBP[i], resultGBP[i]);