Package redesign
Updates testing