Some test class code cleanup