Added a couple more e2e tests - all tests are green now