Merge "Add unit test for PDP groups"