Fixing an issue with the CallerTest