Some cleanup
Gherkin tests
Random items