Fix var assignment in test
Add one more test
Update IDEA version used
Fixed the short var resolution to work
Merge branch 'dlsniper-fix-shorvarreturntest'

* dlsniper-fix-shorvarreturntest:
  Fixed the short var resolution to work
  Update IDEA version used
  Add one more test
  Fix var assignment in test