Fixed minor unit test dir leakage

Change-Id: I78cf483dde5078d4fad4e1738d8bb8a8f634e3b1