Moved tests to more accurate package