E2E tests and misc corrections