Add a test for #1957 and #1951
fix #1951
Fix #1957. Note we only need to worry about "this" within a constructor.
Update test .src for constructor parameter name change