I just took the written a couple weeks ago, there were no NDB questions but they did reuse some of the figures with movable cards. For example, some of the questions were the same but reworded like "In this plane the ADF needle shows the GPS course". I think you'll be fine, but if you're using a test prep product with the old question bank I would not skip the NDB questions. Also make sure you brush up on GPS (types of approaches, IFR/VFR only, WAAS, RAIM, usage during a VOR or ILS approach, etc). There were a lot more GPS questions than I saw in the practice tests.