Adds some minor tweaks to e2e tests
Moves e2e test directory