Merge "Use underscores in package name as test dependency." into main