Fixes a regression in the e2e target and makes things easier (hopefully) going forward when adding new e2e tests.