Restore versions of test files from develop branch. Meld butchered the encodings when I was merging things.
Fix permission on CP932 directory