Fixed test battery to new needs