Reverted changes with PyNodeID. Fix of python tests.