Fixing bug introduced in 0.6.0. Adding basic test-kitchen coverage