You have probably solved your issue by now, but just in case:
We have never repaired a leak, (knock on wood), but when we need to check something out, we use weights in the pockets of shorts to stay down and use plastic tubing for breathing.