Solving some encoding problems with our spec tests