Merge "Rename several tests to be easier to read."