Merge "libsnapshot: no underscores in test names"