Iteration on kitchen test code review