Merge "Add Kitchen tests"