Rename some variables
Add SpecFlow/Gherkin tests