Moved tests around so they will be included in the sdist