Merge "Use library name rather than package name for test dependency." into main