diff --git a/build/Build.TestCalamariFlavourProject.cs b/build/Build.TestCalamariFlavourProject.cs
index edf8bd5e3f..1837832f35 100644
--- a/build/Build.TestCalamariFlavourProject.cs
+++ b/build/Build.TestCalamariFlavourProject.cs
@@ -40,6 +40,7 @@ partial class Build
 
             DotNetTasks.DotNetTest(settings => settings
                 .SetProjectFile($"CalamariTests/{testProject}.dll")
+                .SetProcessWorkingDirectory("CalamariTests")
                 .SetFilter(CalamariFlavourTestCaseFilter)
                 .SetLoggers("trx")
                 .SetProcessExitHandler(
diff --git a/source/Calamari/ArgoCD/Conventions/ArgoCDTaskLogExtensionMethods.cs b/source/Calamari/ArgoCD/Conventions/ArgoCDTaskLogExtensionMethods.cs
index 07baaf0f6a..3c758c89a4 100644
--- a/source/Calamari/ArgoCD/Conventions/ArgoCDTaskLogExtensionMethods.cs
+++ b/source/Calamari/ArgoCD/Conventions/ArgoCDTaskLogExtensionMethods.cs
@@ -36,7 +36,7 @@ static void LogMissingAnnotationsWarning(this ILog log, (ProjectSlug Project, En
             {
                 log.WarnFormat(" - {0}: {1}", ArgoCDConstants.Annotations.OctopusTenantAnnotationKey("<sourcename>".ToApplicationSourceName()), deploymentScope.Tenant);
             }
-            log.WarnFormat("Annotation creation documentation can be found {0}.", log.FormatShortLink("argo-cd-scoping-annotations", "here"));
+            log.WarnFormat("Annotation creation documentation can be found {0}.", log.FormatShortLink("argo-cd-annotations-docs", "here"));
         }
         
         public static void LogApplicationCounts(this ILog log, (ProjectSlug Project, EnvironmentSlug Environment, TenantSlug? Tenant) deploymentScope, ArgoCDApplicationDto[] applications)
diff --git a/source/Calamari/ArgoCD/Git/RepositoryFactory.cs b/source/Calamari/ArgoCD/Git/RepositoryFactory.cs
index 7f611cc8eb..bc416e0f7f 100644
--- a/source/Calamari/ArgoCD/Git/RepositoryFactory.cs
+++ b/source/Calamari/ArgoCD/Git/RepositoryFactory.cs
@@ -73,7 +73,9 @@ RepositoryWrapper CheckoutGitRepository(IGitConnection gitConnection, string che
                 catch (Exception e)
                 {
                     timedOp.Abandon(e);
-                    throw new CommandException($"Failed to clone Git repository at {gitConnection.Url}. Are you sure this is a Git repository?");
+                    log.Error("Cloning repository failed");
+                    log.Verbose(e.PrettyPrint());
+                    throw new CommandException($"Failed to clone Git repository at {gitConnection.Url}. Are you sure this is a Git repository? {e.Message}", e);
                 }
             }