Merge "Rename unit test"