diff --git a/WorkflowExample/Ordering/MenuSelectionViewController.swift b/WorkflowExample/Ordering/MenuSelectionViewController.swift
index 05242de33..24c2bc8e8 100644
--- a/WorkflowExample/Ordering/MenuSelectionViewController.swift
+++ b/WorkflowExample/Ordering/MenuSelectionViewController.swift
@@ -31,7 +31,6 @@ extension MenuSelectionViewController: FlowRepresentable {
             o.menuType = order.location?.menuTypes.first
             proceedInWorkflow(o)
         }
-        return false
         return (order.location?.menuTypes.count ?? 0) > 1
     }
 }
diff --git a/WorkflowTests/UIKitPresenterTests.swift b/WorkflowTests/UIKitPresenterTests.swift
index 02d0a1a55..4ee03ad7d 100644
--- a/WorkflowTests/UIKitPresenterTests.swift
+++ b/WorkflowTests/UIKitPresenterTests.swift
@@ -557,7 +557,7 @@ class UIKitPresenterTests: XCTestCase {
         (UIApplication.topViewController() as? FR1)?.proceedInWorkflow()
         waitUntil(UIApplication.topViewController() is FR3)
         XCTAssert(UIApplication.topViewController() is FR3)
-        (UIApplication.topViewController()?.navigationController)?.backButton?.simulateTouch()
+        (UIApplication.topViewController()?.navigationController)?.popViewController(animated: false)
         waitUntil(UIApplication.topViewController() is FR2)
         XCTAssert(UIApplication.topViewController() is FR2)
     }
@@ -636,7 +636,7 @@ class UIKitPresenterTests: XCTestCase {
         (UIApplication.topViewController() as? FR2)?.proceedInWorkflow()
         waitUntil(UIApplication.topViewController() is FR3)
         XCTAssert(UIApplication.topViewController() is FR3)
-        (UIApplication.topViewController()?.navigationController)?.backButton?.simulateTouch()
+        (UIApplication.topViewController()?.navigationController)?.popViewController(animated: false)
         waitUntil(UIApplication.topViewController() is FR1)
         XCTAssert(UIApplication.topViewController() is FR1)
     }