Fixed test stuff to stay in sync with protocol updates.