add 'id' function that does identity, useful to convert rvalues to const lvalues. Use it in 'run'
fix includes in a couple of tests