Added PT validation and basic tests