Fix up script/cucumber and script/test