WIP: re-enable e2e