Add test-kitchen and fix failure highlighted by tests