Add more to the gherkin builder

Include some tests