fix bugs vs test-battery