Moved tests under the module directory
Moving stuff around some more