WIP: Add launcher, use it for two tests

Change-Id: Iab21a78fe2bbfdd39f0650c95ae26853a62b8f1d