Fixes e2e tests, closes #199