Don't use lambdas for the repeat limit evaluation
Comment out the not yet supported tests
Changed some variable names to improve the code clarity