Make charset-related tests more friendly to hhvm; stricter tests for demo files