Merge "Satisfy dependencies in kitchen tests"