PtG keyword updated. Added new tests.