[TASK] Improve Unittests

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