Add current tests fix.
Fix callable case