Fixed unit tests - e2e tests still borked