Added test kitchen support