Subtest improvements
Fix obscure possiblity of forking in a subtest