Add solved project
Fix broken html tests, and actually make final tests run
Merging 'master' into 'gh-pages'