test-kitchen, and some bug fixes

Not quite ready to go, but want to get your thoughts @miah