diff --git a/core/src/main/java/eu/tsystems/mms/tic/testframework/report/model/context/MethodContext.java b/core/src/main/java/eu/tsystems/mms/tic/testframework/report/model/context/MethodContext.java
index cb38d1717..6d1e16cab 100644
--- a/core/src/main/java/eu/tsystems/mms/tic/testframework/report/model/context/MethodContext.java
+++ b/core/src/main/java/eu/tsystems/mms/tic/testframework/report/model/context/MethodContext.java
@@ -172,7 +172,7 @@ public void addDependsOnMethod(MethodContext methodContext) {
     }
 
     private Stream<TestStepAction> readTestStepActions() {
-        return this.readTestSteps().flatMap(testStep -> testStep.getTestStepActions().stream());
+        return this.readTestSteps().flatMap(TestStep::readActions);
     }
 
     public TestStepAction addLogMessage(LogMessage logMessage) {
@@ -199,6 +199,10 @@ public void setFailedStep(TestStep step) {
         this.lastFailedStep = step;
     }
 
+    public Optional<TestStep> getFailedStep() {
+        return Optional.ofNullable(this.lastFailedStep);
+    }
+
     public Stream<ErrorContext> readErrors() {
         return readTestStepActions().flatMap(TestStepAction::readErrors);
     }
diff --git a/core/src/main/java/eu/tsystems/mms/tic/testframework/report/model/steps/TestStep.java b/core/src/main/java/eu/tsystems/mms/tic/testframework/report/model/steps/TestStep.java
index d4f480f14..882b2e374 100644
--- a/core/src/main/java/eu/tsystems/mms/tic/testframework/report/model/steps/TestStep.java
+++ b/core/src/main/java/eu/tsystems/mms/tic/testframework/report/model/steps/TestStep.java
@@ -31,6 +31,7 @@
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Optional;
+import java.util.stream.Stream;
 
 /**
  * A static wrapper for {@link MethodContext#readTestSteps()}
@@ -66,10 +67,17 @@ public String getName() {
         return name;
     }
 
+    /**
+     * @deprecated Use {@link #readActions()} instead
+     */
     public List<TestStepAction> getTestStepActions() {
         return testStepActions;
     }
 
+    public Stream<TestStepAction> readActions() {
+        return this.testStepActions.stream();
+    }
+
     /**
      * @return The last action if it matches the name, otherwise a new action is returned.
      */
diff --git a/driver-ui-desktop/src/main/java/eu/tsystems/mms/tic/testframework/webdrivermanager/DesktopWebDriverRequest.java b/driver-ui-desktop/src/main/java/eu/tsystems/mms/tic/testframework/webdrivermanager/DesktopWebDriverRequest.java
index 493396255..5ca3105ba 100644
--- a/driver-ui-desktop/src/main/java/eu/tsystems/mms/tic/testframework/webdrivermanager/DesktopWebDriverRequest.java
+++ b/driver-ui-desktop/src/main/java/eu/tsystems/mms/tic/testframework/webdrivermanager/DesktopWebDriverRequest.java
@@ -54,11 +54,11 @@ public URL getSeleniumServerUrl() {
     }
 
     public DesktopWebDriverRequest setSeleniumServerUrl(String url) throws MalformedURLException {
-        this.seleniumServerURL = new URL(url);
-        return this;
+        return this.setSeleniumServerUrl(new URL(url));
     }
 
     public DesktopWebDriverRequest setSeleniumServerUrl(URL url) {
+        this.setWebDriverMode(WebDriverMode.remote);
         this.seleniumServerURL = url;
         return this;
     }
diff --git a/integration-tests/src/test/java/eu/tsystems/mms/tic/testframework/test/reporting/ScreenshotsTest.java b/integration-tests/src/test/java/eu/tsystems/mms/tic/testframework/test/reporting/ScreenshotsTest.java
index 4b69c634e..89ef72ab2 100644
--- a/integration-tests/src/test/java/eu/tsystems/mms/tic/testframework/test/reporting/ScreenshotsTest.java
+++ b/integration-tests/src/test/java/eu/tsystems/mms/tic/testframework/test/reporting/ScreenshotsTest.java
@@ -30,6 +30,7 @@
 import eu.tsystems.mms.tic.testframework.report.model.context.MethodContext;
 import eu.tsystems.mms.tic.testframework.report.model.context.Screenshot;
 import eu.tsystems.mms.tic.testframework.report.model.context.SessionContext;
+import eu.tsystems.mms.tic.testframework.report.model.steps.TestStep;
 import eu.tsystems.mms.tic.testframework.report.utils.ExecutionContextController;
 import eu.tsystems.mms.tic.testframework.test.execution.TestStatusTest;
 import eu.tsystems.mms.tic.testframework.test.page.PageFactoryTest;
@@ -105,7 +106,7 @@ private void screenshotIsPresentInMethodContext(String methodName, boolean exclu
                     .collect(Collectors.toList());
 
             long count = methodContext.readTestSteps()
-                    .flatMap(testStep -> testStep.getTestStepActions().stream())
+                    .flatMap(TestStep::readActions)
                     .flatMap(testStepAction -> testStepAction.readEntries(Screenshot.class))
                     .filter(screenshot -> relevantSessionKeys.contains(screenshot.getMetaData().get(Screenshot.MetaData.SESSION_KEY)))
                     .count();
diff --git a/report-model/src/main/java/eu/tsystems/mms/tic/testframework/adapters/ContextExporter.java b/report-model/src/main/java/eu/tsystems/mms/tic/testframework/adapters/ContextExporter.java
index 6a00b8507..f2ee4b157 100644
--- a/report-model/src/main/java/eu/tsystems/mms/tic/testframework/adapters/ContextExporter.java
+++ b/report-model/src/main/java/eu/tsystems/mms/tic/testframework/adapters/ContextExporter.java
@@ -238,7 +238,7 @@ public TestStep.Builder buildTestStep(eu.tsystems.mms.tic.testframework.report.m
         TestStep.Builder builder = TestStep.newBuilder();
 
         apply(testStep.getName(), builder::setName);
-        forEach(testStep.getTestStepActions(), testStepAction -> builder.addActions(buildTestStepAction(testStepAction)));
+        testStep.readActions().forEach(testStepAction -> builder.addActions(buildTestStepAction(testStepAction)));
 
         return builder;
     }