namespace fixes to get tests running