TestBattle merged