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

Fixes #1537