More robust tests for forking.
trying to fix this commit problem