I want to get this merged where we only switch to the runner, so actual test changes are more obvious when reviewing.