Fixed a bug in which I was sending the wrong value to rule-charset-count
for special characters.  Tests also updated.