Move test from r222476 to a better place; this was reduced to the point that it
no longer contained a generic lambda.