Changed: preventing infinite loops in clientAPI based tests