[BUGFIX] Fix failing tests

Change-Id: I9cdc2ed661083ef8e167446e71722513c8d431ad
Reviewed-on: https://review.typo3.org/30922
Reviewed-by: Georg Ringer
Tested-by: Georg Ringer