Fix #1201: add label flag and fix e2e tests
3 files changed