Ensure a non-word character is after the name

This fixes if the macro name is at the beggingin of the import name
Fixes if a macro name is exactly the import name
Added tests to check for cases like #521
Updated macroExpectation because I added macros
Fixed linting
Merge pull request #533 from janka102/fix-#521

Fixed colliding macro names and import names (#521)