rework namespace stubbing