More work on e2e tests