Use the proper forking check
Remove apparently useless test
Merge pull request #1173 from tamird/1-x-stable

Better tests for forking hooks