Moved generic Nodes back from substance-article.
Fix regressions in tests.