Fix test-battery

Incompatibility in the log improvement branch and the class property branch
causes test battery failure when they are merged together.