More tests added to cover encounters, newVillage and rolls