diff --git a/LanguageRecogniser/Cpp/CppActivityDiagramVisitor.cs b/LanguageRecogniser/Cpp/CppActivityDiagramVisitor.cs
index 84156298f9a956f026b1b5d77082f594d0a16565..d6844ccbdc68eb8f8b6f6264b6a11668d56fb4a5 100644
--- a/LanguageRecogniser/Cpp/CppActivityDiagramVisitor.cs
+++ b/LanguageRecogniser/Cpp/CppActivityDiagramVisitor.cs
@@ -205,7 +205,17 @@ public class CppActivityDiagramVisitor : CPP14ParserBaseVisitor<object>
 
     public override object VisitIterationStatement(CPP14Parser.IterationStatementContext context)
     {
-        var condition = context.condition().GetText();
+        string condition = string.Empty;
+        if (context.forRangeDeclaration() != null)
+        {
+            string rangeDecl = ExtractOriginalText(context.forRangeDeclaration());
+            string rangeExpr = ExtractOriginalText(context.forRangeInitializer());
+            condition = $"{rangeDecl}:{rangeExpr}";
+        }
+        else if(context.condition() != null)
+        {
+            condition = context.condition().GetText();
+        }
         
         if(context.forInitStatement() != null)
         {
diff --git a/UnitTest/Input/main.cpp b/UnitTest/Input/main.cpp
index c85c1ad6ad828f2d422c71091186a5322fc02b01..7b92cd7c85e27d6996d297fbb109f7c488a0ffb4 100644
--- a/UnitTest/Input/main.cpp
+++ b/UnitTest/Input/main.cpp
@@ -38,6 +38,10 @@ int main() {
     person1.age = 25;
     person1.displayInfo();
 
+    for(auto& outlink : node->outlinks) {
+        outlink.hi();
+    }
+
     if(person1.age > 18) {
         std::cout << "Student is an adult" << std::endl;
         int i = 0;
diff --git a/UnitTest/WebApiTests.cs b/UnitTest/WebApiTests.cs
index 78aabc1675aa3394747d12a6262c828fc2fe0eaa..16ae5f9d8a47b3883ba4f0ce018d333290ffd9b4 100644
--- a/UnitTest/WebApiTests.cs
+++ b/UnitTest/WebApiTests.cs
@@ -380,6 +380,11 @@ public class WebApiTests
                 //check if filestream is not empty
                 var stream = fileStreamResult.FileStream;
                 Assert.That(stream.Length > 0);
+                string contents;
+                using(var sr = new StreamReader(stream))
+                {
+                    contents = sr.ReadToEnd();
+                }
             }
             else
             {