Additional minor cleanup of test classes.