Put overridable variable inside Arg class. Fix tests