Include fixer cleanup + new test scenario
minor #386 Include fixer cleanup + new test scenario (keradus)

This PR was squashed before being merged into the 0.5.x-dev branch (closes #386).

Discussion
----------

Include fixer cleanup + new test scenario

1. Tokens::removeTrailingWhitespace should not change internal collection iterator index
2. Include fixer now remove trailing whitespace after ) as well

Commits
-------

4055560 Include fixer cleanup + new test scenario