Oh... hrm... that's a touch surprising that in_kitchen calls solo init. I'm all for it taking arguments if we give it a better name. Feel free to also push this stuff to it's own ticket. I'm not one to hold up features in favor of test semantics.