Let me go a little deeper here. In my extremely humble 200 hour pilot mind I think that the Commercial Written and air test should focus A LOT on ADM and dealing with certain situations.
For example, on the commerical written why ask questions FROM the PPL? If I can't figure out a performance chart, figure out something with the weather, or understand how my plane works I should not be flying.
The oral and practial should be based largely on situations that you might be put in as a commercial pilot. The examiner should give you a scenario such as a difficult passenger, open door, etc and see how you deal with it. For example a CFI at my school asked for me to be safety pilot so he can stay instrument current. I went a long for the ride, but before doing so I asked him if I can give him some situtions. While he was holding I called 'my plane' then proceded to turn off the GPS, cover up the backup VOR, the DG, Attitude indicator, and do a few circles to try to get him lost in the approach. Then I opened the airvents on his face so try to distract him some more. This helped him deal with distractions that can occur at a very critical portion of flight. Why can't the FAA make the commercial tests like this?