Fix nested function test; add nested fn tuple test