Improve testing reliability
Merge pull request #704 from derekwaynecarr/issue_603

Improve testing reliability