more test class fixes