added better e2e tests