diff --git a/throttling/src/main/java/com/iluwatar/throttling/CallsCount.java b/throttling/src/main/java/com/iluwatar/throttling/CallsCount.java
index 25b3dedb3..9b274849a 100644
--- a/throttling/src/main/java/com/iluwatar/throttling/CallsCount.java
+++ b/throttling/src/main/java/com/iluwatar/throttling/CallsCount.java
@@ -61,7 +61,7 @@ public final class CallsCount {
    * @param tenantName name of the tenant.
    * @return the count of the tenant.
    */
-  public static Long getCount(String tenantName) {
+  public static long getCount(String tenantName) {
     return tenantCallsCount.get(tenantName).get();
   }
   
diff --git a/throttling/src/test/java/com/iluwatar/throttling/B2BServiceTest.java b/throttling/src/test/java/com/iluwatar/throttling/B2BServiceTest.java
index 4ea540bcd..aaab62b3a 100644
--- a/throttling/src/test/java/com/iluwatar/throttling/B2BServiceTest.java
+++ b/throttling/src/test/java/com/iluwatar/throttling/B2BServiceTest.java
@@ -39,12 +39,10 @@ public class B2BServiceTest {
     Throttler timer = new ThrottleTimerImpl(100);
     B2BService service = new B2BService(timer);
 
-    long counter = 0;
     for (int i = 0; i < 5; i++) {
       service.dummyCustomerApi(tenant);
-      counter = CallsCount.getCount(tenant.getName());
     }
-    
+    long counter = CallsCount.getCount(tenant.getName());
     Assert.assertTrue("Counter limit must be reached", counter == 2);
   }
 }