dotcase: few more cleanups for in call stuff

Change-Id: I0c337ea3cc8746c7f5ba4f709297a11ebea00062