Fixing failing cucumber features after ticket #1289