AI-802 Updated ExpressionBuilderTest for readability
AI-802 Fixed regression in skip expression builder