KNOX-467: Unit tests failing on windows. Second attempt.

(cherry picked from commit 56dd56dd1f5888f6c7bc4ec23e1d345156185401)