Haha, that video is hilarious!
Btw, one of the best ways to increase cardiovascular fitness is by swimming. It has been proven that consistent swimmers throughout their life live longer than even runners. Partly due to the fact that running causes more injuries and even if you're injured you can still swim. The reason why I mention this is that if you want to kill two birds with one stone (prep for swim test and improved fitness) you may want to include lap swimming in your weekly training regiment. Swimming also works two very key muscle components used for push-ups. Shoulders and a smaller muscle on the outside of your pecs (it's the one that makes you look really sexy to the ladies, lol.) This is also the reason why women absolutely love swimmers bodies. You can google what it is if you like because I can't remember, but pushups and swimming are virtually the only two ways to isolate work on that muscle group. Swimming also aids in your breathing recovery because it simply makes your heart work harder! Join a swim team like I did even and swim 5-8 hrs a week. You'll find that by doing this you make push-ups easier and treading water for two minutes will feel like a breeze. I'm assuming the problem with most if they have issues with the swim test is not due to fitness but more due to the fact that they hardly spend any time in the water.
You swim enough and you'll be treading water for two minutes in between your drills.