revert utf-8 test and add merge test