Fix more test refactoring issues.
8 files changed