Add unit tests for clean machine case
Apply cr
Merge pull request #1713 from ogail/1676

Add unit tests for clean machine case