Merge "Refactor smoke tests to enable one-app-per-testcase runs"