Moved tests in proper place and Fixed imports from self
Merge pull request #2 from luyikei/update_import

Moved tests in proper place and Fixed imports from self