Updated battle tests