Added pgIsContainedBy criteria
Cleaned test case