Converted to cucumber
Merge branch 'delebota'