More test changes, included Gardens