Move tests to there own folder
Remove redundant file