Added a test for issue #54.
Selected the correct compilation unit for fixing variable declarations.

Made the fixer locate the right compilation unit that declares the variable being annotated.

Fixed issue #54.