Renaming test packages to matches main packages