More test changes, no bugs fixed.