Fix issue #66: Check feature give incorrect output when new lines are present in imports
Add require for mock, clean up test case
Fix test for python3 compatibility
Merge pull request #68 from timothycrosley/feature/fix-issue-66

Fix issue #66: Check feature give incorrect output when new lines are pr...
Merge in latest changes from develop