Fix test refactoring issues for Linux.
4 files changed