[fix] Adapting tests to changes in Node class
[enh] Replacing ugly code with a nice regexp