[COOK-3267] - Improving tests, updating kitchen scaffolding, improving style