repaired unit and e2e tests