Update for recent server versions, and a barebones test