cleaning up and organizing e2e tests