Cleaned up package names in test folders to match main