Adds phpunit dev dependency
Fixes bugs from refactoring
Merge branch 'master' of github:qua-bla/html