Yes, in order to get National Registry certified again, you will need to take the psychomotor/hands-on/skills test and the written/cognitive exam for the National Registry.
You can take the psychomotor exam at any time with any Nat. Reg. proctor in your state, you don't need to wait to be done with the refresher for that test. The national registry written exam will need to be taken after turning in the certificate of completion for the 40 hours and then applying to test with the national registry.