Fixing unit tests.
Fixing e2e tests.