I know there's a few US hams on here, so:

According to the CQ web page, the FCC has announced licence restructuring
http://news.cq-amateur-radio.com/news.htm

Only one 5 wpm code test for general, no additional code for extra.

Tech, general, and extra, and that's all