More test-changes.