Clean up package-info

Fix package names. .  Remove duplicates in test packages so they don't conflict with those in non-test packages.