Fixed some issues with Parallel running of test.
Merge pull request #84 from EaseTech/Christiaan

pull #82 bugfix from Christiaan to master
Fixed issue #74.
Merge pull request #85 from EaseTech/master

pull from master to christiaan.