WEB-2930: bumped version and tweaked after code review
WEB-2930: Updated tests