more work on adding tests to entitynode, for the new functionality