More test changes...