More test changes, up cookbook deps