More tests and fix to argument expressions not evaluated in new context.