Tweak step definitions to fix Travis build