Moving around a bunch of stuff, and adding one big e2e test