initial work for e2e tests
more work on e2e