Add PID to test group names to avoid clashes

Updated manifest