Fixed the support of 2-word tests without a custom node class
bug #1538 Fixed the support of 2-word tests without a custom node class (stof)

This PR was merged into the 1.16-dev branch.

Discussion
----------

Fixed the support of 2-word tests without a custom node class

Fixes #1537

Commits
-------

0082e05 Fixed the support of 2-word tests without a custom node class