More Territory cleanup; now 100% line & branch coverage