tweaks for for_each and invokable, for_each tests