Unit and E2E tests passing