More test fixer-upping