Code cleanup in test classes
3 files changed