[chore] Fixing unit and e2e tests