Make more lax in the tests (don't assert that client pid matches, only test what matters - the uid).
Merge remote-tracking branch 'origin/master' into macosx-support