Reenable some parts
All E2E tests fixed