[WIP] A couple updates

Add test-kitchen support (more coming) ..