better lambda tests; shadowing fixes