reuse existing step definitions and fix quoting