Adpated Test to new package