rose app-upgrade, rose macro: fix test-battery