Fix unit tests and some wiki formatting