Moved tests inside package