Merge "Rename test class to match code."