Fixes in Caller Tests