Merge branch 'jk/test-lib-drop-pid-from-results'