Moved tests inside package (again)