endpoints: Fix failing unit tests from r419196