[BUGFIX] Broken unit and functional tests

Change-Id: I68ff079ea2c7ae8f7d9f926348f89e651e0dbece
Reviewed-on: https://review.typo3.org/29146
Reviewed-by: Xavier Perseguers
Tested-by: Xavier Perseguers