Remove old test syntax
Strip server attr when comparing restore nodes
Add trackIds flag to the registry values tests