implemented more e2e testing