diff --git a/src/exchange-lib/testing_api_cmd_withdraw.c b/src/exchange-lib/testing_api_cmd_withdraw.c
index 50cc45ed5..90a15b80f 100644
--- a/src/exchange-lib/testing_api_cmd_withdraw.c
+++ b/src/exchange-lib/testing_api_cmd_withdraw.c
@@ -97,19 +97,19 @@ struct WithdrawState
    * How long do we wait until we retry?
    */
   struct GNUNET_TIME_Relative backoff;
-  
+
   /**
    * Expected HTTP response code to the request.
    */
   unsigned int expected_response_code;
 
   /**
-   * Was this command modified via 
-   * #TALER_TESTING_cmd_withdraw_with_retry to 
+   * Was this command modified via
+   * #TALER_TESTING_cmd_withdraw_with_retry to
    * enable retries?
    */
   int do_retry;
-  
+
 };
 
 
@@ -502,12 +502,12 @@ struct TALER_TESTING_Command
 TALER_TESTING_cmd_withdraw_with_retry (struct TALER_TESTING_Command cmd)
 {
   struct WithdrawState *ws;
-  
+
   GNUNET_assert (&withdraw_run == cmd.run);
   ws = cmd.cls;
   ws->do_retry = GNUNET_YES;
   return cmd;
 }
-  
+
 
 /* end of testing_api_cmd_withdraw.c */
diff --git a/src/exchange-lib/testing_api_loop.c b/src/exchange-lib/testing_api_loop.c
index 893fc49bf..9d777dfa4 100644
--- a/src/exchange-lib/testing_api_loop.c
+++ b/src/exchange-lib/testing_api_loop.c
@@ -56,7 +56,7 @@ TALER_TESTING_interpreter_lookup_command
     return NULL;
   }
   /* Search backwards as we most likely reference recent commands */
-  for (int i=is->ip; 0 >= i; i--)
+  for (int i=is->ip; i >= 0; i--)
   {
     const struct TALER_TESTING_Command *cmd = &is->commands[i];
 
@@ -75,9 +75,9 @@ TALER_TESTING_interpreter_lookup_command
                      TALER_TESTING_get_trait_cmd (cmd,
                                                   BATCH_INDEX,
                                                   &batch));
-      for (unsigned int i=0;
-           NULL != (cmd = &batch[i])->label;
-           i++)
+      for (unsigned int j=0;
+           NULL != (cmd = &batch[j])->label;
+           j++)
       {
         if ( (NULL != cmd->label) &&
              (0 == strcmp (cmd->label,
@@ -86,7 +86,7 @@ TALER_TESTING_interpreter_lookup_command
       }
     }
   }
-  GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+  GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
               "Command not found: %s\n",
               label);
   return NULL;