Hopefully fixes small race conditions for test cases
Merge pull request #82 from joaquincasares/race_condition_fixes

Hopefully fixes small race conditions for test cases