Revert "More fork tests"

This reverts commit 0bcf06d0cd3dd8ffc12b5d757e971478bd71d326.
Revert "Revert "More fork tests""

This reverts commit be8c9b10086fe1582e5169c4495154696aaa1df0.
Revert "Revert "Revert "More fork tests"""

This reverts commit cc741bb490ac13fd1bd6b10b8e72fc01c9d09643.
Revert "Revert "More fork tests""

This reverts commit be8c9b10086fe1582e5169c4495154696aaa1df0.
Fixing things