added files to correct packages, updated tests