Revert two unrelated test changes.