Cleanin up some args dict key lookups in factory
Added test back walking move