Moved tests in proper place and Fixed imports from self