align local run and add e2e tests
19 files changed