PADI has a 400m swim without swim aids, a 800m swim with mask, fins, and snorkel, a 15 minute tread or float with hands out of the water for the last 2 minutes and a 100m diver tow with both divers in full gear.
Both divers in drysuits, steel doubles, with big giant canister lights, etc too if your instructor is into real world scenarios - "train the way dive, dive the way you train"