perf update: using track by  in repeats
updated tests to match changes in the helpers file