Issue 2617: Adding cucumber test