Update cucumber files; fix two failing scenarios