diff --git a/AUTHORS.md b/AUTHORS.md
index 5372b1bc..67b47fdc 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -26,6 +26,7 @@
 - Hanaa Allohibi - <https://github.com/hn-n>
 - Shey Alnasrawi - <https://github.com/Milksheyke>
 - Costas Korai - <https://github.com/watcher6280>
+- Bassam Mutairi - <https://github.com/mutairibassam>
 
 ## Translators
 
diff --git a/test/helpers/colors_test.dart b/test/helpers/colors_test.dart
index 2441f548..12803e45 100644
--- a/test/helpers/colors_test.dart
+++ b/test/helpers/colors_test.dart
@@ -3,34 +3,76 @@ import 'package:wger/helpers/colors.dart';
 
 void main() {
   group('generateChartColors', () {
-    test('should generate 3 colors for 3 items', () {
-      final colors = generateChartColors(3).toList();
-      expect(colors, LIST_OF_COLORS3);
+    test('should generate 3 colors for 3 items using iterator', () {
+      final iterator = generateChartColors(3).iterator;
+      final expectedColors = LIST_OF_COLORS3.iterator;
+
+      while (iterator.moveNext() && expectedColors.moveNext()) {
+        expect(iterator.current, equals(expectedColors.current));
+      }
+
+      expect(iterator.moveNext(), isFalse);
+      expect(expectedColors.moveNext(), isFalse);
     });
 
-    test('should generate 5 colors for 5 items', () {
-      final colors = generateChartColors(5).toList();
-      expect(colors, LIST_OF_COLORS5);
+    test('should generate 5 colors for 5 items using iterator', () {
+      final iterator = generateChartColors(5).iterator;
+      final expectedColors = LIST_OF_COLORS5.iterator;
+
+      while (iterator.moveNext() && expectedColors.moveNext()) {
+        expect(iterator.current, equals(expectedColors.current));
+      }
+
+      expect(iterator.moveNext(), isFalse);
+      expect(expectedColors.moveNext(), isFalse);
     });
 
-    test('should generate 8 colors for 8 items', () {
-      final colors = generateChartColors(8).toList();
-      expect(colors, LIST_OF_COLORS8);
+    test('should generate 8 colors for 8 items using iterator', () {
+      final iterator = generateChartColors(8).iterator;
+      final expectedColors = LIST_OF_COLORS8.iterator;
+
+      while (iterator.moveNext() && expectedColors.moveNext()) {
+        expect(iterator.current, equals(expectedColors.current));
+      }
+
+      expect(iterator.moveNext(), isFalse);
+      expect(expectedColors.moveNext(), isFalse);
     });
 
-    test('should generate 8 colors for more than 8 items', () {
-      final colors = generateChartColors(10).toList();
-      expect(colors, LIST_OF_COLORS8);
+    test('should generate 8 colors for more than 8 items using iterator', () {
+      final iterator = generateChartColors(10).iterator;
+      final expectedColors = LIST_OF_COLORS8.iterator;
+
+      while (iterator.moveNext() && expectedColors.moveNext()) {
+        expect(iterator.current, equals(expectedColors.current));
+      }
+
+      expect(iterator.moveNext(), isFalse);
+      expect(expectedColors.moveNext(), isFalse);
     });
 
-    test('should generate 8 colors for 0 items', () {
-      final colors = generateChartColors(0).toList();
-      expect(colors, LIST_OF_COLORS3);
+    test('should generate 8 colors for 0 items using iterator', () {
+      final iterator = generateChartColors(0).iterator;
+      final expectedColors = LIST_OF_COLORS3.iterator;
+
+      while (iterator.moveNext() && expectedColors.moveNext()) {
+        expect(iterator.current, equals(expectedColors.current));
+      }
+
+      expect(iterator.moveNext(), isFalse);
+      expect(expectedColors.moveNext(), isFalse);
     });
 
-    test('should generate 8 colors for negative items', () {
-      final colors = generateChartColors(-5).toList();
-      expect(colors, LIST_OF_COLORS3);
+    test('should generate 8 colors for negative items using iterator', () {
+      final iterator = generateChartColors(-5).iterator;
+      final expectedColors = LIST_OF_COLORS3.iterator;
+
+      while (iterator.moveNext() && expectedColors.moveNext()) {
+        expect(iterator.current, equals(expectedColors.current));
+      }
+
+      expect(iterator.moveNext(), isFalse);
+      expect(expectedColors.moveNext(), isFalse);
     });
   });
 }