Fix remote shell spec
Fix resourceful spec