Fix resolving inside test files.

Also fixes #1036
Make sure all the other tests pass
Mark a passing test a not @Ignored.
Unignore a set of tests.
renamed a folder to make a test pass
Fixed short var resolution
Don't resolve functions to methods.

Closes #1045