Feature/e2e test improvements