@@ -224,9 +224,9 @@ Rectangle {
224224 onCheckedChanged: {
225225 var surface = topLevelSurfaceList.inputMethodSurface;
226226 if (checked) {
227− surface.setState(Mir.RestoredState);
227+ surface.requestState(Mir.RestoredState);
228228 } else {
229− surface.setState(Mir.MinimizedState);
229+ surface.requestState(Mir.MinimizedState);
230230 }
231231 }
232232 }
@@ -262,7 +262,6 @@ Rectangle {
262262 topLevelSurfaceList = null;
263263 }
264264 }
265− property var topLevelSurfaceList: null
266265
267266 function init() {
268267 prepareShell();
@@ -271,8 +270,6 @@ Rectangle {
271270 var tutorialLeftTimer = findInvisibleChild(tutorialLeft, "tutorialLeftTimer");
272271 tutorialLeftTimer.interval = 0;
273272 tryCompare(tutorialLeft, "opacity", 1);
274−
275− stage = findChild(shell, "stage"); // from StageTestCase
276273 }
277274
278275 function cleanup() {
@@ -317,6 +314,10 @@ Rectangle {
317314 AccountsService.demoEdges = true;
318315
319316 LightDM.Greeter.hideGreeter();
317+
318+ stage = findChild(shell, "stage"); // from StageTestCase
319+
320+ startApplication("unity8-dash");
320321 }
321322
322323 function loadShell(state) {
@@ -329,7 +330,7 @@ Rectangle {
329330 verify(surfaceManager);
330331 surfaceManager.createInputMethodSurface();
331332
332− tryCompareFunction(function() { return root.topLevelSurfaceList.inputMethodSurface !== null }, true);
333+ tryCompareFunction(function() { return topLevelSurfaceList.inputMethodSurface !== null }, true);
333334 }
334335
335336 function swipeAwayGreeter() {
@@ -732,7 +733,7 @@ Rectangle {
732733
733734 ensureInputMethodSurface();
734735 var surface = topLevelSurfaceList.inputMethodSurface;
735− surface.setState(Mir.RestoredState);
736+ surface.requestState(Mir.RestoredState);
736737
737738 var inputMethod = findInvisibleChild(shell, "inputMethod");
738739 tryCompare(inputMethod, "visible", true);
@@ -745,7 +746,7 @@ Rectangle {
745746 verify(!tutorial.delayed);
746747
747748 ensureInputMethodSurface();
748− topLevelSurfaceList.inputMethodSurface.setState(Mir.RestoredState);
749+ topLevelSurfaceList.inputMethodSurface.requestState(Mir.RestoredState);
749750
750751 tryCompare(tutorial, "delayed", true);
751752 }