esl-9685. Added more examples and tests