support for mixed mock and target calls
Fix for func_all option