Fix test files to cure Travis fails