Fully non local delgation fix
improve test delegation