Make unit tests friendlier to running independently