WORK IN PROGRESS: E2E test fixes