QueryExpressionExpander: Fixed failing unit tests.