scope fixes and expression testdata