Ported daemon hack to other unit tests, made directory test work on repo.