various tests fixes and reload enhancements
make sure __CF_USER_TEXT_ENCODING gets discarded in all cases
Merge pull request #480 from mozilla-services/fixes

test fixes on a slow/old Macbook