Rich text unit tests

Plus a little tidying
I'd rather "Discussion:" was on the next line