Fixed tests to match recent changes (renaming of Ctr to Ctor, and the use of NodeId instead of int).