did some refactoring in the charset specs to make it look like the rest