started fixing tests
Merge branch 'master' of https://github.com/MovLib/www