e2e testing and mending code to fit them