fix test error reporting and RelationExpressionNodeConverter-bug
Merge branch 'master' into dev