Changes to PID Testing

Mainly changes to PID testing.