Fix more test refactoring issues.