Removed legacy tests
Merge branch 'master' into bad-html-rendition

Conflicts:
	test/highlight.js