Closure tests + more generic call extension