Fix composer update
Fix tests
Update composer.json
Merge pull request #55 from wmde/dm20again

Fix everything