Update font tests. Got left behind by #673.
Merge branch 'master' into gazetteer