MISC: Updates broken cucumeber tests