Back out test changes