Final adjustments for one last test for namespace fixes