Make unit tests friendlier to running independently
Merge pull request #764 from ptarjan/master

Make unit tests friendlier to running independently