Revert some changes that break the execution of several *_unittests #131

Closed cpu82 closed 6 years ago