Added a couple more e2e tests and bug fixes