Move e2e tests out of client