Merged Tests into master
Merge branch 'master' of github.com:utwente-di/di18