merge / finalize changes in branch bugfix-phpunit-update

[gesinn-it-gea]

@hexmode did some work in bugfix-phpunit-update. Would be great if we could get changes merged now that we have CI running :-) @hexmode what's the status of your changes. Is this already PR-ready?