Make test-battery command compatible with previous change.