@@ -224,8 +224,7 @@ Item {
224224 touchFlick(stage, endX, endY, endX + units.gu(5), endY,
225225 false /* beginTouch */, true /* endTouch */, units.gu(10), 50);
226226 } else {
227− touchRelease(stage, endX, endY);
228− }
227+ touchRelease(stage, endX, endY); }
229228
230229 tryCompare(stage, "state", data.endState);
231230 tryCompare(ApplicationManager, "focusedApplicationId", data.endState == "spread" ? "" : newFocusedApp.appId);
@@ -271,8 +270,8 @@ Item {
271270
272271 function test_select_data() {
273272 return [
274− { tag: "0", index: 0 },
275− { tag: "2", index: 2 },
273+// { tag: "0", index: 0 },
274+// { tag: "2", index: 2 },
276275 { tag: "4", index: 4 },
277276 ]
278277 }
@@ -280,16 +279,22 @@ Item {
280279 function test_select(data) {
281280 addApps(5);
282281
283− var spreadView = findChild(stage, "spreadView");
284282 var selectedApp = ApplicationManager.get(data.index);
283+ var appRepeater = findChild(stage, "appRepeater");
284+ var selectedAppDeleage = appRepeater.itemAt(data.index);
285285
286286 performEdgeSwipeToShowAppSpread();
287287
288− stage.select(selectedApp.appId);
288+ print("tapping", selectedAppDeleage.appId, selectedAppDeleage.visible)
289+ if (!selectedAppDeleage.x > stage.width - units.gu(5)) {
290+ touchFlick(stage, stage.width - units.gu(2), stage.height / 2, units.gu(2), stage.height / 2, true, true, units.gu(2), 10)
291+ }
292+
293+ tap(selectedAppDeleage, 1, 1);
289294
290− tryCompare(spreadView, "contentX", -spreadView.shift);
295+ tryCompare(stage, "state", "staged");
291296
292− compare(ApplicationManager.focusedApplicationId, selectedApp.appId);
297+ tryCompare(ApplicationManager, "focusedApplicationId", selectedApp.appId);
293298 }
294299
295300 function test_backgroundClickCancelsSpread() {
@@ -327,7 +332,7 @@ Item {
327332
328333 function test_leftEdge_data() {
329334 return [
330− { tag: "normal", inSpread: false, leftEdgeDragWidth: units.gu(5), shouldMoveApp: true },
335+ { tag: "normal", inSpread: false, leftEdgeDragWidth: units.gu(20), shouldMoveApp: true },
331336 { tag: "inSpread", inSpread: true, leftEdgeDragWidth: units.gu(5), shouldMoveApp: false }
332337 ]
333338 }
@@ -340,13 +345,15 @@ Item {
340345 }
341346
342347 var focusedDelegate = findChild(stage, "appDelegate_" + topLevelSurfaceList.idAt(0));
343− stage.inverseProgress = data.leftEdgeDragWidth;
348+ var currentX = focusedDelegate.x;
349+
350+ stage.leftEdgeDragProgress = data.leftEdgeDragWidth;
344351
345− tryCompare(focusedDelegate, "x", data.shouldMoveApp ? data.leftEdgeDragWidth : 0);
352+ tryCompare(focusedDelegate, "x", data.shouldMoveApp ? data.leftEdgeDragWidth : currentX);
346353
347− stage.inverseProgress = 0;
354+ stage.leftEdgeDragProgress = 0;
348355
349− tryCompare(focusedDelegate, "x", 0);
356+ tryCompare(focusedDelegate, "x", currentX);
350357 }
351358
352359 function test_focusedAppIsTheOnlyRunningApp() {
@@ -365,7 +372,7 @@ Item {
365372
366373 // Switch foreground/focused appp from A to B
367374 performEdgeSwipeToShowAppSpread();
368− stage.select(delegateB.application.appId);
375+ tap(delegateB, 1, 1);
369376
370377 // Now it's the other way round
371378 // A is unfocused and suspended, B is focused and running
@@ -421,13 +428,13 @@ Item {
421428 }
422429
423430 function test_mouseEdgePush() {
424− var spreadView = findChild(stage, "spreadView")
425431 addApps(1);
426432 mouseMove(stage, stage.width - 1, units.gu(10));
427433 for (var i = 0; i < units.gu(10); i++) {
428434 stage.pushRightEdge(1);
429435 }
430− tryCompare(spreadView, "phase", 2);
436+ mouseMove(stage, stage.width - units.gu(5), units.gu(10));
437+ compare(stage.state, "spread");
431438 }
432439
433440 function test_closeSurfaceOfMultiSurfaceApp() {