Tweaking class test ready for new website
Merge branch 'master' into gh-pages