Adjust tests to handle server tokens on private endpoints