Tidy up and add step defs
Add stepdefs for autocomplete