Refactor the new test for Linux/Win.