[MERGE] Some test fixes for Mac

[Martin Pool]

Martin Pool has voted +1.
Status is now: Approved
Comment:
I agree with you that although it would be nice, I don't think fixing 
unicode filenames on Mac is the highest priority at the moment.

If we're deciding that for the moment they just won't work maybe we 
should explain that somewhere?  Maybe file a bug and link to it from the 
faq?


For details, see: 
http://bundlebuggy.aaronbentley.com/request/%3C461126F4.5030600%40arbash-meinel.com%3E