Fixed NodeId tests for temporary workaround.