Revert a part of the previous commit that was left in by mistake and also add a test for handling of positions when the haystack contains non-BMP chars