More test-fixing
Merge branch 'persnusk'