Fix forked processes of TestResource from being terminated betweenTestCase methods being executed
Revert 2 accidentally updated classes/files