Fixed tests regarding StringEncoder singleton change