Updated unit and e2e tests to pass