Adding/fixing up e2e testing to work.