Revert "Run the two test phases separately"
Revert "Run the two test phases separately"

This reverts commit d0871ce2af12ec6d964c400a8a5c92918c4300c8.

say25/desktop,kactus-io/kactus,BugTesterTest/desktops,hjobrien/desktop,hjobrien/desktop,artivilla/desktop,kactus-io/kactus,gengjiawen/desktop,BugTesterTest/desktops,desktop/desktop,say25/desktop,shiftkey/desktop,say25/desktop,j-f1/forked-desktop,hjobrien/desktop,hjobrien/desktop,j-f1/forked-desktop,kactus-io/kactus,shiftkey/desktop,artivilla/desktop,shiftkey/desktop,j-f1/forked-desktop,desktop/desktop,gengjiawen/desktop,desktop/desktop,BugTesterTest/desktops,kactus-io/kactus,BugTesterTest/desktops,desktop/desktop,gengjiawen/desktop,shiftkey/desktop,say25/desktop,artivilla/desktop,j-f1/forked-desktop,artivilla/desktop,gengjiawen/desktop