Also fix a broken test case related to checking the return value -1 where socket was not defined in the library used in the tests. This was tested running test-my-pr with 500 packages. The difference was six fewer FPs.