changed test packages to match production code packages