Fix for CDSVisualizationTest failing
Fix for CDSVisualizationTest failing and removed ToDo