Added more regexes (and unit tests)

* Conversion of $j → $
* Inclusion of wgServer to avoid [bug 34036](https://bugzilla.wikimedia.org/34036)