Cleaned up the files naming for E2E tests and removed legacy files.