I am of the opinion that there should be three categories of physical fitness tests.
Category 1 - for soldiers in support units. Basic fitness test. Pushups, situps, 1 mile run.
Category 2 - for soldiers in combat support units. Fitness plus upper body and endurance. Pushups, situps, 2 mile run, squats and chin ups.
Category 3 - for soldiers in combat units. Pushups, situps, 2 mile run, squats, chinups and 30 lbs ruck 5 mile force march, same rucksack over the head lift.
No difference for male / female.
In combat, the rear can quickly become the front lines and when engaged in direct combat, line units cannot come to the support of support elements. If the solider, sailor, airman, or Marine is unable to fight because he is out of shape, he does not need to be a solider, sailor, airman, or Marine.