[BUGFIX] Cleanup/Fix UnitTest

Refactor same UnitTests to work with the new namespace
schema. / WIP

Change-Id: I06e36065db25e6e1bcf215a247e08509f31c3ff7
Reviewed-on: https://review.typo3.org/31043
Reviewed-by: Jo Hasenau
Tested-by: Jo Hasenau