Made the ADD TB a bit nicer, no new tests were introduced though.