Fixed e2e tests, broke unit tests. Now unit tests are also working again.