[TASK] Change base TestCase to a 6 compliant

This is a double of the PR to the namespaces workbench and fixes the CS errors..

Who ever pulls it in gets rid of the problem.